diff --git a/contract/src/main/java/io/pravega/schemaregistry/contract/transform/ModelHelper.java b/contract/src/main/java/io/pravega/schemaregistry/contract/transform/ModelHelper.java
index 3d6892068..4597a1b1c 100644
--- a/contract/src/main/java/io/pravega/schemaregistry/contract/transform/ModelHelper.java
+++ b/contract/src/main/java/io/pravega/schemaregistry/contract/transform/ModelHelper.java
@@ -147,7 +147,7 @@ public static io.pravega.schemaregistry.contract.data.BackwardAndForward.Backwar
             return new io.pravega.schemaregistry.contract.data.BackwardAndForward.Backward();
         } else if (obj instanceof BackwardTill) {
             return new io.pravega.schemaregistry.contract.data.BackwardAndForward.BackwardTill(
-                    decode(((io.pravega.schemaregistry.contract.generated.rest.model.BackwardTill) backward.getBackwardPolicy()).getVersionInfo()));
+                    decode(((io.pravega.schemaregistry.contract.generated.rest.model.BackwardTill) obj).getVersionInfo()));
         } else if (obj instanceof BackwardTransitive) {
             return new io.pravega.schemaregistry.contract.data.BackwardAndForward.BackwardTransitive();
         } else {
@@ -176,7 +176,7 @@ public static io.pravega.schemaregistry.contract.data.BackwardAndForward.Forward
             return new io.pravega.schemaregistry.contract.data.BackwardAndForward.Forward();
         } else if (obj instanceof ForwardTill) {
             return new io.pravega.schemaregistry.contract.data.BackwardAndForward.ForwardTill(
-                    decode(((io.pravega.schemaregistry.contract.generated.rest.model.ForwardTill) forward.getForwardPolicy()).getVersionInfo()));
+                    decode(((io.pravega.schemaregistry.contract.generated.rest.model.ForwardTill) obj).getVersionInfo()));
         } else if (obj instanceof ForwardTransitive) {
             return new io.pravega.schemaregistry.contract.data.BackwardAndForward.ForwardTransitive();
         } else {
diff --git a/contract/src/test/java/io/pravega/schemaregistry/contract/transform/ModelHelperTest.java b/contract/src/test/java/io/pravega/schemaregistry/contract/transform/ModelHelperTest.java
index ab9f92366..9df6ce455 100644
--- a/contract/src/test/java/io/pravega/schemaregistry/contract/transform/ModelHelperTest.java
+++ b/contract/src/test/java/io/pravega/schemaregistry/contract/transform/ModelHelperTest.java
@@ -9,6 +9,7 @@
  */
 package io.pravega.schemaregistry.contract.transform;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
 import io.pravega.schemaregistry.contract.generated.rest.model.Backward;
 import io.pravega.schemaregistry.contract.generated.rest.model.BackwardAndForward;
@@ -28,6 +29,7 @@
 import io.pravega.schemaregistry.contract.generated.rest.model.VersionInfo;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collections;
@@ -35,6 +37,8 @@
 import static org.junit.Assert.*;
 
 public class ModelHelperTest {
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    
     @Test
     public void testDecode() {
         SerializationFormat type = new SerializationFormat().serializationFormat(SerializationFormat.SerializationFormatEnum.CUSTOM).fullTypeName("a");
@@ -159,73 +163,77 @@ public void testEncode() {
     }
 
     @Test
-    public void testEncodeAndDecodeCompatibility() {
+    public void testEncodeAndDecodeCompatibility() throws IOException {
         io.pravega.schemaregistry.contract.data.Compatibility compatibility = 
                 io.pravega.schemaregistry.contract.data.Compatibility.allowAny();
-        Compatibility encoded = ModelHelper.encode(compatibility);
+        Compatibility encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         io.pravega.schemaregistry.contract.data.Compatibility decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.denyAll();
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.backward();
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.forward();
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.backwardTransitive();
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.forwardTransitive();
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.full();
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.fullTransitive();
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         io.pravega.schemaregistry.contract.data.VersionInfo versionInfo = new io.pravega.schemaregistry.contract.data.VersionInfo("a", 1, 1);
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.backwardTill(versionInfo);
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.forwardTill(versionInfo);
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.backwardTillAndForwardTill(versionInfo, versionInfo);
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.backwardOneAndForwardTill(versionInfo);
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
 
         compatibility = io.pravega.schemaregistry.contract.data.Compatibility.backwardTillAndForwardOne(versionInfo);
-        encoded = ModelHelper.encode(compatibility);
+        encoded = convert(ModelHelper.encode(compatibility), Compatibility.class);
         decoded = ModelHelper.decode(encoded);
         assertEquals(compatibility, decoded);
-
+    }
+    
+    private <T> T convert(T t, Class<T> tClass) throws IOException {
+        String str = OBJECT_MAPPER.writeValueAsString(t);
+        return OBJECT_MAPPER.readValue(str, tClass);
     }
 }
diff --git a/test/src/test/java/io/pravega/schemaregistry/integrationtest/TestEndToEnd.java b/test/src/test/java/io/pravega/schemaregistry/integrationtest/TestEndToEnd.java
index 9898ed664..4824dde3d 100644
--- a/test/src/test/java/io/pravega/schemaregistry/integrationtest/TestEndToEnd.java
+++ b/test/src/test/java/io/pravega/schemaregistry/integrationtest/TestEndToEnd.java
@@ -163,6 +163,8 @@ public void testEndToEnd() {
         assertEquals(version2.getId(), 1);
         assertEquals(version2.getType(), myTest);
 
+        assertTrue(client.updateCompatibility(group, Compatibility.backwardTillAndForwardOne(version1), null));
+        
         assertFalse(client.updateCompatibility(group, Compatibility.fullTransitive(), Compatibility.forward()));
 
         assertTrue(client.updateCompatibility(group, Compatibility.fullTransitive(), null));