1 files changed, 14 insertions, 18 deletions
diff --git a/account_test.go b/account_test.go
index 5515777..6f44e89 100644
--- a/account_test.go
+++ b/account_test.go
@@ -32,24 +32,22 @@ func TestAccountBasic(t *testing.T) {
 		//Headers() does not fail, i.e. everything parses correctly), but
 		//Content-Type is going to be text/plain because GET on an account lists
 		//the container names as plain text.
-		expectString(t, hdr.Raw.Get("Content-Type"), "text/plain; charset=utf-8")
+		expectString(t, hdr.Get("Content-Type"), "text/plain; charset=utf-8")
 	})
 }
 
 func TestAccountMetadata(t *testing.T) {
 	testWithAccount(t, func(a *Account) {
 		//test creating some metadata
-		err := a.Update(AccountHeaders{
-			Metadata: NewMetadata(
-				"schwift-test1", "first",
-				"schwift-test2", "second",
-			),
-		}, nil)
+		hdr := NewAccountHeaders()
+		hdr.Metadata.Set("schwift-test1", "first")
+		hdr.Metadata.Set("schwift-test2", "second")
+		err := a.Update(hdr, nil)
 		if !expectError(t, err, "") {
 			t.FailNow()
 		}
 
-		hdr, err := a.Headers()
+		hdr, err = a.Headers()
 		if !expectError(t, err, "") {
 			t.FailNow()
 		}
@@ -57,11 +55,9 @@ func TestAccountMetadata(t *testing.T) {
 		expectString(t, hdr.Metadata.Get("schwift-test2"), "second")
 
 		//test deleting some metadata
-		m := make(Metadata)
-		m.Clear("schwift-test1")
-		err = a.Update(AccountHeaders{
-			Metadata: m,
-		}, nil)
+		hdr = NewAccountHeaders()
+		hdr.Metadata.Clear("schwift-test1")
+		err = a.Update(hdr, nil)
 		if !expectError(t, err, "") {
 			t.FailNow()
 		}
@@ -74,11 +70,11 @@ func TestAccountMetadata(t *testing.T) {
 		expectString(t, hdr.Metadata.Get("schwift-test2"), "second")
 
 		//test updating some metadata
-		m = make(Metadata)
-		m.Set("schwift-test2", "changed")
-		err = a.Update(AccountHeaders{
-			Metadata: m,
-		}, nil)
+		hdr = NewAccountHeaders()
+		hdr.Metadata.Set("schwift-test1", "will not be set")
+		hdr.Metadata.Del("schwift-test1")
+		hdr.Metadata.Set("schwift-test2", "changed")
+		err = a.Update(hdr, nil)
 		if !expectError(t, err, "") {
 			t.FailNow()
 		}