diff --git a/message_test.go b/message_test.go
index 5d71c9e..a0e9105 100644
--- a/message_test.go
+++ b/message_test.go
@@ -413,10 +413,10 @@ func TestMessage(t *testing.T) {
 
 		// reset the fields
 		err = clone.Marshal(&struct {
-			F2 *string `iso8583:"2,keepzero"`
+			F2 *field.String `iso8583:",keepzero"`
 			F3 *struct {
-				F2 *string `iso8583:"2,keepzero"`
-			} `iso8583:"3,keepzero"`
+				F2 *field.String `iso8583:",keepzero"`
+			} `iso8583:",keepzero"`
 		}{})
 		require.NoError(t, err)
 
@@ -1765,7 +1765,7 @@ func TestMessageClone(t *testing.T) {
 	// check if the PAN is reset
 	require.Equal(t, "", responseData.F2.Value())
 	// check if the F55.F9A is reset
-	require.Equal(t, "210720", responseData.F55.F9A.Value())
+	require.Equal(t, "", responseData.F55.F9A.Value())
 }
 
 func TestMessageMarshaling(t *testing.T) {