diff --git a/src/test/java/com/facebook/ads/ServerSideTest.java b/src/test/java/com/facebook/ads/ServerSideTest.java
index cbd5ec33..7982b498 100644
--- a/src/test/java/com/facebook/ads/ServerSideTest.java
+++ b/src/test/java/com/facebook/ads/ServerSideTest.java
@@ -33,6 +33,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 public class ServerSideTest {
@@ -85,10 +86,13 @@ public void CustomDataParametersTest() {
     String serializedPayload = eventRequest.getSerializedPayload();
 
     // ASSERT
-    String cpString = (new Gson()).toJson(customProperties);
     String serializedContents = (new Gson()).toJson(contents);
     String serializedContentIds = (new Gson()).toJson(contentIds);
-    Assert.assertTrue(serializedPayload.contains(cpString.substring(1, cpString.length() - 1)));
+
+    Map<String, String> mp = customProperties; 
+    mp.forEach((key, value) -> Assert.assertTrue(serializedPayload.contains(
+            "\"" + key + "\":" +  "\"" + value + "\"" 
+    ))); 
     Assert.assertTrue(serializedPayload.contains(serializedContents));
     Assert.assertTrue(serializedPayload.contains(serializedContentIds));
     Assert.assertTrue(serializedPayload.contains(currency.toLowerCase()));
diff --git a/src/test/java/com/facebook/ads/SignalTest.java b/src/test/java/com/facebook/ads/SignalTest.java
index 3a9476ac..61b4eef9 100644
--- a/src/test/java/com/facebook/ads/SignalTest.java
+++ b/src/test/java/com/facebook/ads/SignalTest.java
@@ -30,6 +30,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class SignalTest {
         @Test
@@ -100,8 +101,9 @@ public void EventRequestTest() {
                 Assert.assertTrue(bdapiDataJSON.contains("\"event_name\":\"Purchase\""));
 
                 String capiDataJSON = (new Gson()).toJson(capiEventRequest.getData());
-                String customPropertiesJSON = (new Gson()).toJson(customProperties);
-                Assert.assertTrue(capiDataJSON
-                                .contains(customPropertiesJSON.substring(1, customPropertiesJSON.length() - 1)));
+                Map<String, String> mp = customProperties; 
+                mp.forEach((key, value) -> Assert.assertTrue(capiDataJSON.contains(
+                        "\"" + key + "\":" +  "\"" + value + "\"" 
+                ))); 
         }
 }