diff --git a/Parse/src/main/java/com/parse/ParseAnalytics.java b/Parse/src/main/java/com/parse/ParseAnalytics.java
index 9dcef947b..a06861cf0 100644
--- a/Parse/src/main/java/com/parse/ParseAnalytics.java
+++ b/Parse/src/main/java/com/parse/ParseAnalytics.java
@@ -13,6 +13,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -192,16 +194,15 @@ public static Task<Void> trackEventInBackground(final String name,
     if (name == null || name.trim().length() == 0) {
       throw new IllegalArgumentException("A name for the custom event must be provided.");
     }
-
-    final JSONObject jsonDimensions = dimensions != null
-        ? (JSONObject) NoObjectsEncoder.get().encode(dimensions)
+    final Map<String, String> dimensionsCopy = dimensions != null
+        ? Collections.unmodifiableMap(new HashMap<>(dimensions))
         : null;
 
     return ParseUser.getCurrentSessionTokenAsync().onSuccessTask(new Continuation<String, Task<Void>>() {
       @Override
       public Task<Void> then(Task<String> task) throws Exception {
         String sessionToken = task.getResult();
-        return getAnalyticsController().trackEventInBackground(name, jsonDimensions, sessionToken);
+        return getAnalyticsController().trackEventInBackground(name, dimensionsCopy, sessionToken);
       }
     });
   }
diff --git a/Parse/src/main/java/com/parse/ParseAnalyticsController.java b/Parse/src/main/java/com/parse/ParseAnalyticsController.java
index 5466b8e8a..e2bf99c61 100644
--- a/Parse/src/main/java/com/parse/ParseAnalyticsController.java
+++ b/Parse/src/main/java/com/parse/ParseAnalyticsController.java
@@ -10,6 +10,8 @@
 
 import org.json.JSONObject;
 
+import java.util.Map;
+
 import bolts.Task;
 
 /** package */ class ParseAnalyticsController {
@@ -21,8 +23,8 @@ public ParseAnalyticsController(ParseEventuallyQueue eventuallyQueue) {
   }
 
   public Task<Void> trackEventInBackground(final String name,
-    JSONObject jsonDimensions, String sessionToken) {
-    ParseRESTCommand command = ParseRESTAnalyticsCommand.trackEventCommand(name, jsonDimensions,
+    Map<String, String> dimensions, String sessionToken) {
+    ParseRESTCommand command = ParseRESTAnalyticsCommand.trackEventCommand(name, dimensions,
         sessionToken);
 
     Task<JSONObject> eventuallyTask = eventuallyQueue.enqueueEventuallyAsync(command, null);
diff --git a/Parse/src/main/java/com/parse/ParseConfig.java b/Parse/src/main/java/com/parse/ParseConfig.java
index 4eb9f67d0..3c7f03586 100644
--- a/Parse/src/main/java/com/parse/ParseConfig.java
+++ b/Parse/src/main/java/com/parse/ParseConfig.java
@@ -9,7 +9,6 @@
 package com.parse;
 
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Collections;
@@ -104,13 +103,18 @@ public Task<ParseConfig> then(Task<Void> task) throws Exception {
     });
   }
 
-  /* package */ ParseConfig(JSONObject object, ParseDecoder decoder) {
-    Map<String, Object> decodedObject = (Map<String, Object>) decoder.decode(object);
+  @SuppressWarnings("unchecked")
+  /* package */ static ParseConfig decode(JSONObject json, ParseDecoder decoder) {
+    Map<String, Object> decodedObject = (Map<String, Object>) decoder.decode(json);
     Map<String, Object> decodedParams = (Map<String, Object>) decodedObject.get("params");
     if (decodedParams == null) {
       throw new RuntimeException("Object did not contain the 'params' key.");
     }
-    this.params = Collections.unmodifiableMap(decodedParams);
+    return new ParseConfig(decodedParams);
+  }
+
+  /* package */ ParseConfig(Map<String, Object> params) {
+    this.params = Collections.unmodifiableMap(params);
   }
 
   /* package */ ParseConfig() {
diff --git a/Parse/src/main/java/com/parse/ParseConfigController.java b/Parse/src/main/java/com/parse/ParseConfigController.java
index 404cdd796..628abb6c4 100644
--- a/Parse/src/main/java/com/parse/ParseConfigController.java
+++ b/Parse/src/main/java/com/parse/ParseConfigController.java
@@ -35,7 +35,7 @@ public Task<ParseConfig> getAsync(String sessionToken) {
       public Task<ParseConfig> then(Task<JSONObject> task) throws Exception {
         JSONObject result = task.getResult();
 
-        final ParseConfig config = new ParseConfig(result, ParseDecoder.get());
+        final ParseConfig config = ParseConfig.decode(result, ParseDecoder.get());
         return currentConfigController.setCurrentConfigAsync(config).continueWith(new Continuation<Void, ParseConfig>() {
           @Override
           public ParseConfig then(Task<Void> task) throws Exception {
diff --git a/Parse/src/main/java/com/parse/ParseCurrentConfigController.java b/Parse/src/main/java/com/parse/ParseCurrentConfigController.java
index c584b9e16..f3e7b6611 100644
--- a/Parse/src/main/java/com/parse/ParseCurrentConfigController.java
+++ b/Parse/src/main/java/com/parse/ParseCurrentConfigController.java
@@ -68,7 +68,7 @@ public ParseConfig call() throws Exception {
     } catch (IOException | JSONException e) {
       return null;
     }
-    return new ParseConfig(json, ParseDecoder.get());
+    return ParseConfig.decode(json, ParseDecoder.get());
   }
 
   /* package */ void clearCurrentConfigForTesting() {
diff --git a/Parse/src/main/java/com/parse/ParseEncoder.java b/Parse/src/main/java/com/parse/ParseEncoder.java
index a05780ac8..096092f57 100644
--- a/Parse/src/main/java/com/parse/ParseEncoder.java
+++ b/Parse/src/main/java/com/parse/ParseEncoder.java
@@ -16,7 +16,6 @@
 
 import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -29,11 +28,19 @@
 /** package */ abstract class ParseEncoder {
 
   /* package */ static boolean isValidType(Object value) {
-    return value instanceof JSONObject || value instanceof JSONArray || value instanceof String
-        || value instanceof Number || value instanceof Boolean || value == JSONObject.NULL
-        || value instanceof ParseObject || value instanceof ParseACL || value instanceof ParseFile
-        || value instanceof ParseGeoPoint || value instanceof Date || value instanceof byte[]
-        || value instanceof List || value instanceof Map || value instanceof ParseRelation;
+    return value instanceof String
+        || value instanceof Number
+        || value instanceof Boolean
+        || value instanceof Date
+        || value instanceof List
+        || value instanceof Map
+        || value instanceof byte[]
+        || value == JSONObject.NULL
+        || value instanceof ParseObject
+        || value instanceof ParseACL
+        || value instanceof ParseFile
+        || value instanceof ParseGeoPoint
+        || value instanceof ParseRelation;
   }
 
   public Object encode(Object object) {
@@ -92,17 +99,6 @@ public Object encode(Object object) {
         return json;
       }
 
-      if (object instanceof JSONObject) {
-        JSONObject map = (JSONObject) object;
-        JSONObject json = new JSONObject();
-        Iterator<?> keys = map.keys();
-        while (keys.hasNext()) {
-          String key = (String) keys.next();
-          json.put(key, encode(map.opt(key)));
-        }
-        return json;
-      }
-
       if (object instanceof Collection) {
         JSONArray array = new JSONArray();
         for (Object item : (Collection<?>) object) {
@@ -111,15 +107,6 @@ public Object encode(Object object) {
         return array;
       }
 
-      if (object instanceof JSONArray) {
-        JSONArray array = (JSONArray) object;
-        JSONArray json = new JSONArray();
-        for (int i = 0; i < array.length(); ++i) {
-          json.put(encode(array.opt(i)));
-        }
-        return json;
-      }
-
       if (object instanceof ParseRelation) {
         ParseRelation<?> relation = (ParseRelation<?>) object;
         return relation.encodeToJSON(this);
diff --git a/Parse/src/main/java/com/parse/ParseObject.java b/Parse/src/main/java/com/parse/ParseObject.java
index f7f6b19a8..2f2449e3c 100644
--- a/Parse/src/main/java/com/parse/ParseObject.java
+++ b/Parse/src/main/java/com/parse/ParseObject.java
@@ -2918,6 +2918,14 @@ public void put(String key, Object value) {
       throw new IllegalArgumentException("value may not be null.");
     }
 
+    if (value instanceof JSONObject) {
+      ParseDecoder decoder = ParseDecoder.get();
+      value = decoder.convertJSONObjectToMap((JSONObject) value);
+    } else if (value instanceof JSONArray){
+      ParseDecoder decoder = ParseDecoder.get();
+      value = decoder.convertJSONArrayToList((JSONArray) value);
+    }
+
     if (!ParseEncoder.isValidType(value)) {
       throw new IllegalArgumentException("invalid type for value: " + value.getClass().toString());
     }
@@ -3166,12 +3174,6 @@ public JSONArray getJSONArray(String key) {
   public <T> List<T> getList(String key) {
     synchronized (mutex) {
       Object value = estimatedData.get(key);
-
-      if (value instanceof JSONArray) {
-        ParseDecoder decoder = ParseDecoder.get();
-        value = decoder.convertJSONArrayToList((JSONArray) value);
-      }
-
       if (!(value instanceof List)) {
         return null;
       }
@@ -3192,12 +3194,6 @@ public <T> List<T> getList(String key) {
   public <V> Map<String, V> getMap(String key) {
     synchronized (mutex) {
       Object value = estimatedData.get(key);
-
-      if (value instanceof JSONObject) {
-        ParseDecoder decoder = ParseDecoder.get();
-        value = decoder.convertJSONObjectToMap((JSONObject) value);
-      }
-
       if (!(value instanceof Map)) {
         return null;
       }
diff --git a/Parse/src/main/java/com/parse/ParseRESTAnalyticsCommand.java b/Parse/src/main/java/com/parse/ParseRESTAnalyticsCommand.java
index 95c933de2..bf1dfc190 100644
--- a/Parse/src/main/java/com/parse/ParseRESTAnalyticsCommand.java
+++ b/Parse/src/main/java/com/parse/ParseRESTAnalyticsCommand.java
@@ -12,10 +12,10 @@
 
 import com.parse.http.ParseHttpRequest;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 
 /** package */ class ParseRESTAnalyticsCommand extends ParseRESTCommand {
@@ -26,43 +26,46 @@
   // Tracks the AppOpened event
   /* package for test */ static final String EVENT_APP_OPENED = "AppOpened";
 
-  public ParseRESTAnalyticsCommand(
-      String httpPath,
-      ParseHttpRequest.Method httpMethod,
-      Map<String, ?> parameters,
-      String sessionToken) {
-    super(httpPath, httpMethod, parameters, sessionToken);
-  }
+  private static final String PATH = "events/%s";
 
-  public static ParseRESTAnalyticsCommand trackAppOpenedCommand(String pushHash,
-      String sessionToken) {
-    Map<String, String> parameters = null;
-    if (pushHash != null) {
-      parameters = new HashMap<>();
-      parameters.put("push_hash", pushHash);
-    }
-    return trackEventCommand(EVENT_APP_OPENED, parameters, sessionToken);
+  private static final String KEY_AT = "at";
+  private static final String KEY_PUSH_HASH = "push_hash";
+  private static final String KEY_DIMENSIONS = "dimensions";
+
+  public static ParseRESTAnalyticsCommand trackAppOpenedCommand(
+      String pushHash, String sessionToken) {
+    return trackEventCommand(EVENT_APP_OPENED, pushHash, null, sessionToken);
   }
 
-  public static ParseRESTAnalyticsCommand trackEventCommand(String eventName, JSONObject dimensions,
-      String sessionToken) {
-    Map<String, Object> parameters = null;
-    if (dimensions != null) {
-      parameters = new HashMap<>();
-      parameters.put("dimensions", dimensions);
-    }
-    return trackEventCommand(eventName, parameters, sessionToken);
+  public static ParseRESTAnalyticsCommand trackEventCommand(
+      String eventName, Map<String, String> dimensions, String sessionToken) {
+    return trackEventCommand(eventName, null, dimensions, sessionToken);
   }
 
-  /* package */ static ParseRESTAnalyticsCommand trackEventCommand(String eventName,
-      Map<String, ?> parameters, String sessionToken) {
-    String httpPath = String.format("events/%s", Uri.encode(eventName));
-    Map<String, Object> commandParameters = new HashMap<>();
-    if (parameters != null) {
-      commandParameters.putAll(parameters);
+  /* package */ static ParseRESTAnalyticsCommand trackEventCommand(
+      String eventName, String pushHash, Map<String, String> dimensions, String sessionToken) {
+    String httpPath = String.format(PATH, Uri.encode(eventName));
+    JSONObject parameters = new JSONObject();
+    try {
+      parameters.put(KEY_AT, NoObjectsEncoder.get().encode(new Date()));
+      if (pushHash != null) {
+        parameters.put(KEY_PUSH_HASH, pushHash);
+      }
+      if (dimensions != null) {
+        parameters.put(KEY_DIMENSIONS, NoObjectsEncoder.get().encode(dimensions));
+      }
+    } catch (JSONException e) {
+      throw new RuntimeException(e);
     }
-    commandParameters.put("at", NoObjectsEncoder.get().encode(new Date()));
     return new ParseRESTAnalyticsCommand(
-        httpPath, ParseHttpRequest.Method.POST, commandParameters, sessionToken);
+        httpPath, ParseHttpRequest.Method.POST, parameters, sessionToken);
+  }
+
+  public ParseRESTAnalyticsCommand(
+      String httpPath,
+      ParseHttpRequest.Method httpMethod,
+      JSONObject parameters,
+      String sessionToken) {
+    super(httpPath, httpMethod, parameters, sessionToken);
   }
 }
diff --git a/Parse/src/main/java/com/parse/ParseRESTCommand.java b/Parse/src/main/java/com/parse/ParseRESTCommand.java
index 47ae77d18..a37423cc8 100644
--- a/Parse/src/main/java/com/parse/ParseRESTCommand.java
+++ b/Parse/src/main/java/com/parse/ParseRESTCommand.java
@@ -137,7 +137,7 @@ public ParseRESTCommand(
         sessionToken);
   }
 
-  protected ParseRESTCommand(
+  public ParseRESTCommand(
       String httpPath,
       ParseHttpRequest.Method httpMethod,
       JSONObject jsonParameters,
diff --git a/Parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java b/Parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java
index 99522eecb..d3112bc65 100644
--- a/Parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java
+++ b/Parse/src/main/java/com/parse/ParseRESTObjectBatchCommand.java
@@ -18,9 +18,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import bolts.Continuation;
 import bolts.Task;
@@ -59,7 +57,8 @@ public static List<Task<JSONObject>> executeBatch(
       tasks.add(tcs.getTask());
     }
 
-    List<JSONObject> requests = new ArrayList<>(batchSize);
+    JSONObject parameters = new JSONObject();
+    JSONArray requests = new JSONArray();
     try {
       for (ParseRESTObjectCommand command : commands) {
         JSONObject requestParameters = new JSONObject();
@@ -69,14 +68,13 @@ public static List<Task<JSONObject>> executeBatch(
         if (body != null) {
           requestParameters.put("body", body);
         }
-        requests.add(requestParameters);
+        requests.put(requestParameters);
       }
+      parameters.put("requests", requests);
     } catch (JSONException e) {
       throw new RuntimeException(e);
     }
 
-    Map<String, List<JSONObject>> parameters = new HashMap<>();
-    parameters.put("requests", requests);
     ParseRESTCommand command = new ParseRESTObjectBatchCommand(
         "batch", ParseHttpRequest.Method.POST, parameters, sessionToken);
 
@@ -132,7 +130,7 @@ public Void then(Task<JSONObject> task) throws Exception {
   private ParseRESTObjectBatchCommand(
       String httpPath,
       ParseHttpRequest.Method httpMethod,
-      Map<String, ?> parameters,
+      JSONObject parameters,
       String sessionToken) {
     super(httpPath, httpMethod, parameters, sessionToken);
   }
diff --git a/Parse/src/main/java/com/parse/ParseRESTPushCommand.java b/Parse/src/main/java/com/parse/ParseRESTPushCommand.java
index 9a1993c37..df70f203d 100644
--- a/Parse/src/main/java/com/parse/ParseRESTPushCommand.java
+++ b/Parse/src/main/java/com/parse/ParseRESTPushCommand.java
@@ -14,8 +14,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Set;
 
 /** package */ class ParseRESTPushCommand extends ParseRESTCommand {
@@ -30,7 +28,7 @@
   public ParseRESTPushCommand(
       String httpPath,
       ParseHttpRequest.Method httpMethod,
-      Map<String, ?> parameters,
+      JSONObject parameters,
       String sessionToken) {
     super(httpPath, httpMethod, parameters, sessionToken);
   }
@@ -38,41 +36,39 @@ public ParseRESTPushCommand(
   public static ParseRESTPushCommand sendPushCommand(ParseQuery.State<ParseInstallation> query,
   Set<String> targetChannels, String targetDeviceType, Long expirationTime,
       Long expirationInterval, JSONObject payload, String sessionToken) {
-    Map <String, Object> parameters = new HashMap<>();
-
-    if (targetChannels != null) {
-      parameters.put(KEY_CHANNELS, new JSONArray(targetChannels));
-    } else {
-      if (query != null) {
-        ParseQuery.QueryConstraints where = query.constraints();
-        JSONObject whereJSON = (JSONObject) PointerEncoder.get().encode(where);
-        parameters.put(KEY_WHERE, whereJSON);
-      }
-      if (targetDeviceType != null) {
-        JSONObject deviceTypeCondition = new JSONObject();
-        try {
-          deviceTypeCondition.put(KEY_DEVICE_TYPE, targetDeviceType);
-        } catch (JSONException e) {
-          throw new RuntimeException(e.getMessage());
+    JSONObject parameters = new JSONObject();
+    try {
+      if (targetChannels != null) {
+        parameters.put(KEY_CHANNELS, new JSONArray(targetChannels));
+      } else {
+        JSONObject whereJSON = null;
+        if (query != null) {
+          ParseQuery.QueryConstraints where = query.constraints();
+          whereJSON = (JSONObject) PointerEncoder.get().encode(where);
         }
-        parameters.put(KEY_WHERE, deviceTypeCondition);
-      }
-      if (parameters.size() == 0) {
-        // If there are no conditions set, then push to everyone by specifying empty query conditions.
-        parameters.put(KEY_WHERE, new JSONObject());
+        if (targetDeviceType != null) {
+          whereJSON = new JSONObject();
+          whereJSON.put(KEY_DEVICE_TYPE, targetDeviceType);
+        }
+        if (whereJSON == null) {
+          // If there are no conditions set, then push to everyone by specifying empty query conditions.
+          whereJSON = new JSONObject();
+        }
+        parameters.put(KEY_WHERE, whereJSON);
       }
-    }
 
-    if (expirationTime != null) {
-      parameters.put(KEY_EXPIRATION_TIME, expirationTime);
-    } else if (expirationInterval != null) {
-      parameters.put(KEY_EXPIRATION_INTERVAL, expirationInterval);
-    }
+      if (expirationTime != null) {
+        parameters.put(KEY_EXPIRATION_TIME, expirationTime);
+      } else if (expirationInterval != null) {
+        parameters.put(KEY_EXPIRATION_INTERVAL, expirationInterval);
+      }
 
-    if (payload != null) {
-      parameters.put(KEY_DATA, payload);
+      if (payload != null) {
+        parameters.put(KEY_DATA, payload);
+      }
+    } catch (JSONException e) {
+      throw new RuntimeException(e);
     }
-
     return new ParseRESTPushCommand("push", ParseHttpRequest.Method.POST, parameters, sessionToken);
   }
 }
diff --git a/Parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java b/Parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java
index 32507e06a..1c790c1be 100644
--- a/Parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java
+++ b/Parse/src/test/java/com/parse/ParseAnalyticsControllerTest.java
@@ -12,11 +12,12 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import bolts.Task;
 
 import static org.junit.Assert.assertEquals;
@@ -56,9 +57,9 @@ public void testTrackEvent() throws Exception {
 
     // Execute
     ParseAnalyticsController controller = new ParseAnalyticsController(queue);
-    JSONObject json = new JSONObject();
-    json.put("event", "close");
-    ParseTaskUtils.wait(controller.trackEventInBackground("name", json, "sessionToken"));
+    Map<String, String> dimensions = new HashMap<>();
+    dimensions.put("event", "close");
+    ParseTaskUtils.wait(controller.trackEventInBackground("name", dimensions, "sessionToken"));
 
     // Verify eventuallyQueue.enqueueEventuallyAsync
     ArgumentCaptor<ParseRESTCommand> command = ArgumentCaptor.forClass(ParseRESTCommand.class);
diff --git a/Parse/src/test/java/com/parse/ParseAnalyticsTest.java b/Parse/src/test/java/com/parse/ParseAnalyticsTest.java
index 14965f933..ff832ce36 100644
--- a/Parse/src/test/java/com/parse/ParseAnalyticsTest.java
+++ b/Parse/src/test/java/com/parse/ParseAnalyticsTest.java
@@ -17,7 +17,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
+import org.mockito.Matchers;
 import org.robolectric.RobolectricGradleTestRunner;
 import org.robolectric.annotation.Config;
 
@@ -32,9 +32,8 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyMapOf;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isNull;
 import static org.mockito.Mockito.mock;
@@ -47,26 +46,6 @@
 @Config(constants = BuildConfig.class, sdk = 21)
 public class ParseAnalyticsTest {
 
-  private static class DimensionsJsonArgumentMatcher extends ArgumentMatcher<JSONObject> {
-   JSONObject expectedJson;
-
-   public DimensionsJsonArgumentMatcher(Map<String, String> dimensions) {
-     if (dimensions == null) {
-       throw new IllegalArgumentException("dimension map should not be null");
-     }
-     expectedJson = (JSONObject) NoObjectsEncoder.get().encode(dimensions);
-   }
-
-   @Override
-   public boolean matches(Object argument) {
-     return argument == null ? false : expectedJson.toString().equals(argument.toString());
-   }
-  }
-
-  private static JSONObject eqDimensionsJson(Map<String, String> expected) {
-    return argThat(new DimensionsJsonArgumentMatcher(expected));
-  }
-
   ParseAnalyticsController controller;
 
   @Before
@@ -77,7 +56,7 @@ public void setUp() {
     controller = mock(ParseAnalyticsController.class);
     when(controller.trackEventInBackground(
         anyString(),
-        any(JSONObject.class),
+        anyMapOf(String.class, String.class),
         anyString())).thenReturn(Task.<Void>forResult(null));
     when(controller.trackAppOpenedInBackground(
         anyString(),
@@ -117,16 +96,16 @@ public void testTrackEventInBackgroundEmptyName() throws Exception{
   public void testTrackEventInBackgroundNormalName() throws Exception{
     ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test"));
 
-    verify(controller, times(1)).trackEventInBackground(eq("test"), isNull(JSONObject.class),
-        isNull(String.class));
+    verify(controller, times(1)).trackEventInBackground(
+        eq("test"), Matchers.<Map<String, String>>eq(null), isNull(String.class));
   }
 
   @Test
   public void testTrackEventInBackgroundNullParameters() throws Exception{
     ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test", (Map<String, String>) null));
 
-    verify(controller, times(1)).trackEventInBackground(eq("test"), isNull(JSONObject.class),
-        isNull(String.class));
+    verify(controller, times(1)).trackEventInBackground(
+        eq("test"), Matchers.<Map<String, String>>eq(null), isNull(String.class));
   }
 
   @Test
@@ -134,8 +113,8 @@ public void testTrackEventInBackgroundEmptyParameters() throws Exception{
     Map<String, String> dimensions = new HashMap<>();
     ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test", dimensions));
 
-    verify(controller, times(1)).trackEventInBackground(eq("test"), eqDimensionsJson(dimensions),
-        isNull(String.class));
+    verify(controller, times(1)).trackEventInBackground(
+        eq("test"), eq(dimensions), isNull(String.class));
   }
 
   @Test
@@ -144,8 +123,8 @@ public void testTrackEventInBackgroundNormalParameters() throws Exception{
     dimensions.put("key", "value");
     ParseTaskUtils.wait(ParseAnalytics.trackEventInBackground("test", dimensions));
 
-    verify(controller, times(1)).trackEventInBackground(eq("test"), eqDimensionsJson(dimensions),
-        isNull(String.class));
+    verify(controller, times(1)).trackEventInBackground(
+        eq("test"), eq(dimensions), isNull(String.class));
   }
 
   @Test
@@ -153,8 +132,8 @@ public void testTrackEventInBackgroundNullCallback() throws Exception{
     Map<String, String> dimensions = new HashMap<>();
     ParseAnalytics.trackEventInBackground("test", dimensions, null);
 
-    verify(controller, times(1)).trackEventInBackground(eq("test"), eqDimensionsJson(dimensions),
-        isNull(String.class));
+    verify(controller, times(1)).trackEventInBackground(
+        eq("test"), eq(dimensions), isNull(String.class));
   }
 
 
@@ -174,8 +153,8 @@ public void done(ParseException e) {
 
     // Make sure the callback is called
     assertTrue(done.tryAcquire(1, 10, TimeUnit.SECONDS));
-    verify(controller, times(1)).trackEventInBackground(eq("test"), eqDimensionsJson(dimensions),
-        isNull(String.class));
+    verify(controller, times(1)).trackEventInBackground(
+        eq("test"), eq(dimensions), isNull(String.class));
 
     final Semaphore doneAgain = new Semaphore(0);
     ParseAnalytics.trackEventInBackground("test", new SaveCallback() {
@@ -188,8 +167,8 @@ public void done(ParseException e) {
 
     // Make sure the callback is called
     assertTrue(doneAgain.tryAcquire(1, 10, TimeUnit.SECONDS));
-    verify(controller, times(1)).trackEventInBackground(eq("test"), isNull(JSONObject.class),
-        isNull(String.class));
+    verify(controller, times(1)).trackEventInBackground
+        (eq("test"), Matchers.<Map<String, String>>eq(null), isNull(String.class));
   }
 
   //endregion
diff --git a/Parse/src/test/java/com/parse/ParseConfigTest.java b/Parse/src/test/java/com/parse/ParseConfigTest.java
index 3a9db8005..abf42f68d 100644
--- a/Parse/src/test/java/com/parse/ParseConfigTest.java
+++ b/Parse/src/test/java/com/parse/ParseConfigTest.java
@@ -9,7 +9,6 @@
 package com.parse;
 
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
@@ -71,25 +70,25 @@ public void testDefaultConstructor() {
   }
 
   @Test
-  public void testConstructWithValidJsonObject() throws Exception {
+  public void testDecodeWithValidJsonObject() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("string", "value");
     JSONObject json = new JSONObject();
     json.put("params", NoObjectsEncoder.get().encode(params));
 
-    ParseConfig config = new ParseConfig(json, ParseDecoder.get());
+    ParseConfig config = ParseConfig.decode(json, ParseDecoder.get());
     assertEquals(1, config.params.size());
     assertEquals("value", config.params.get("string"));
   }
 
   @Test(expected = RuntimeException.class)
-  public void testConstructWithInvalidJsonObject() throws Exception {
+  public void testDecodeWithInvalidJsonObject() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("string", "value");
     JSONObject json = new JSONObject();
     json.put("error", NoObjectsEncoder.get().encode(params));
 
-    ParseConfig config = new ParseConfig(json, ParseDecoder.get());
+    ParseConfig.decode(json, ParseDecoder.get());
   }
 
   //endregion
@@ -98,10 +97,10 @@ public void testConstructWithInvalidJsonObject() throws Exception {
 
   @Test
   public void testGetInBackgroundSuccess() throws Exception {
-    final Map<String, Object> params = new HashMap<String, Object>();
+    final Map<String, Object> params = new HashMap<>();
     params.put("string", "value");
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     ParseConfigController controller = mockParseConfigControllerWithResponse(config);
     ParseCorePlugins.getInstance().registerConfigController(controller);
 
@@ -114,6 +113,7 @@ public void testGetInBackgroundSuccess() throws Exception {
     assertEquals("value", configAgain.params.get("string"));
   }
 
+  @SuppressWarnings("ThrowableResultOfMethodCallIgnored")
   @Test
   public void testGetInBackgroundFail() throws Exception {
     ParseException exception = new ParseException(ParseException.CONNECTION_FAILED, "error");
@@ -135,7 +135,7 @@ public void testGetInBackgroundWithCallbackSuccess() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("string", "value");
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     ParseConfigController controller = mockParseConfigControllerWithResponse(config);
     ParseCorePlugins.getInstance().registerConfigController(controller);
 
@@ -180,7 +180,7 @@ public void testGetSyncSuccess() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("string", "value");
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     ParseConfigController controller = mockParseConfigControllerWithResponse(config);
     ParseCorePlugins.getInstance().registerConfigController(controller);
 
@@ -216,7 +216,7 @@ public void testGetCurrentConfigSuccess() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("string", "value");
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     ParseConfigController controller = new ParseConfigController(mock(ParseHttpClient.class),
         mockParseCurrentConfigControllerWithResponse(config));
     ParseCorePlugins.getInstance().registerConfigController(controller);
@@ -246,7 +246,7 @@ public void testGetBooleanKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", true);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertTrue(config.getBoolean("key"));
     assertTrue(config.getBoolean("key", false));
   }
@@ -256,7 +256,7 @@ public void testGetBooleanKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", true);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertFalse(config.getBoolean("wrongKey"));
     assertFalse(config.getBoolean("wrongKey", false));
   }
@@ -266,7 +266,7 @@ public void testGetBooleanKeyExistValueNotBoolean() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertFalse(config.getBoolean("key"));
     assertFalse(config.getBoolean("key", false));
   }
@@ -280,7 +280,7 @@ public void testGetIntKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 998);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(config.getInt("key"), 998);
     assertEquals(998, config.getInt("key", 100));
   }
@@ -290,7 +290,7 @@ public void testGetIntKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 998);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(config.getInt("wrongKey"), 0);
     assertEquals(100, config.getInt("wrongKey", 100));
   }
@@ -304,7 +304,7 @@ public void testGetDoubleKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 998.1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(config.getDouble("key"), 998.1, 0.0001);
     assertEquals(998.1, config.getDouble("key", 100.1), 0.0001);
   }
@@ -314,7 +314,7 @@ public void testGetDoubleKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 998.1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(config.getDouble("wrongKey"), 0.0, 0.0001);
     assertEquals(100.1, config.getDouble("wrongKey", 100.1), 0.0001);
   }
@@ -328,7 +328,7 @@ public void testGetLongKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", (long)998);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(config.getLong("key"), (long)998);
     assertEquals((long)998, config.getLong("key", (long) 100));
   }
@@ -338,7 +338,7 @@ public void testGetLongKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", (long)998);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(config.getLong("wrongKey"), (long)0);
     assertEquals((long)100, config.getLong("wrongKey", (long) 100));
   }
@@ -352,7 +352,7 @@ public void testGetKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", "value");
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(config.get("key"), "value");
     assertEquals("value", config.get("key", "haha"));
   }
@@ -362,7 +362,7 @@ public void testGetKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", "value");
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.get("wrongKey"));
     assertEquals("haha", config.get("wrongKey", "haha"));
   }
@@ -373,7 +373,7 @@ public void testGetKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.get("key"));
     assertNull(config.get("key", "haha"));
     assertNull(config.get("keyAgain"));
@@ -389,7 +389,7 @@ public void testGetStringKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", "value");
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(config.getString("key"), "value");
     assertEquals("value", config.getString("key", "haha"));
   }
@@ -399,7 +399,7 @@ public void testGetStringKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", "value");
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getString("wrongKey"));
     assertEquals("haha", config.getString("wrongKey", "haha"));
   }
@@ -409,7 +409,7 @@ public void testGetStringKeyExistValueNotString() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getString("key"));
     assertEquals("haha", config.getString("key", "haha"));
   }
@@ -420,7 +420,7 @@ public void testGetStringKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getString("key"));
     assertNull(config.getString("key", "haha"));
     assertNull(config.getString("keyAgain"));
@@ -440,7 +440,7 @@ public void testGetDateKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", date);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(date.getTime(), config.getDate("key").getTime());
     assertEquals(date.getTime(), config.getDate("key", dateAgain).getTime());
   }
@@ -454,7 +454,7 @@ public void testGetDateKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", date);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getDate("wrongKey"));
     assertSame(dateAgain, config.getDate("wrongKey", dateAgain));
   }
@@ -466,7 +466,7 @@ public void testGetDateKeyExistValueNotDate() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getDate("key"));
     assertSame(date, config.getDate("key", date));
   }
@@ -479,7 +479,7 @@ public void testGetDateKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getDate("key"));
     assertNull(config.getDate("key", date));
     assertNull(config.getDate("keyAgain"));
@@ -503,7 +503,7 @@ public void testGetListKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", list);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertArrayEquals(list.toArray(), config.getList("key").toArray());
     assertArrayEquals(list.toArray(), config.getList("key", listAgain).toArray());
   }
@@ -521,7 +521,7 @@ public void testGetListKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", list);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getList("wrongKey"));
     assertSame(listAgain, config.getList("wrongKey", listAgain));
   }
@@ -535,7 +535,7 @@ public void testGetListKeyExistValueNotList() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getList("key"));
     assertSame(list, config.getList("key", list));
   }
@@ -550,7 +550,7 @@ public void testGetListKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getList("key"));
     assertNull(config.getList("key", list));
     assertNull(config.getList("keyAgain"));
@@ -568,7 +568,7 @@ public void testGetNumberKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", number);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertEquals(number, config.getNumber("key"));
     assertEquals(number, config.getNumber("key", numberAgain));
   }
@@ -580,7 +580,7 @@ public void testGetNumberKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", number);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getNumber("wrongKey"));
     assertSame(numberAgain, config.getNumber("wrongKey", numberAgain));
   }
@@ -591,7 +591,7 @@ public void testGetNumberKeyExistValueNotNumber() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", new ArrayList<String>());
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getNumber("key"));
     assertSame(number, config.getNumber("key", number));
   }
@@ -603,7 +603,7 @@ public void testGetNumberKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getNumber("key"));
     assertNull(config.getNumber("key", number));
     assertNull(config.getNumber("keyAgain"));
@@ -627,7 +627,7 @@ public void testGetMapKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", map);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     Map<String, Object> mapConfig = config.getMap("key");
     assertEquals(3, mapConfig.size());
     assertEquals("foo", mapConfig.get("first"));
@@ -649,7 +649,7 @@ public void testGetMapKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", map);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getMap("wrongKey"));
     assertSame(mapAgain, config.getMap("wrongKey", mapAgain));
   }
@@ -663,7 +663,7 @@ public void testGetMapKeyExistValueNotMap() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getMap("key"));
     assertSame(map, config.getMap("key", map));
   }
@@ -678,7 +678,7 @@ public void testGetMapKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getMap("key"));
     assertNull(config.getMap("key", map));
     assertNull(config.getMap("keyAgain"));
@@ -691,16 +691,16 @@ public void testGetMapKeyExistValueNull() throws Exception {
 
   @Test
   public void testGetJsonObjectKeyExist() throws Exception {
-    final JSONObject json = new JSONObject();
-    json.put("key", "value");
-    final JSONObject jsonAgain = new JSONObject();
-    jsonAgain.put("keyAgain", "valueAgain");
+    final Map<String, String> value = new HashMap<>();
+    value.put("key", "value");
     final Map<String, Object> params = new HashMap<>();
-    params.put("key", json);
+    params.put("key", value);
 
-    ParseConfig config = createSampleParseConfig(params);
+    final JSONObject json = new JSONObject(value);
+
+    ParseConfig config = new ParseConfig(params);
     assertEquals(json, config.getJSONObject("key"), JSONCompareMode.NON_EXTENSIBLE);
-    assertEquals(json, config.getJSONObject("key", jsonAgain),
+    assertEquals(json, config.getJSONObject("key", new JSONObject()),
         JSONCompareMode.NON_EXTENSIBLE);
   }
 
@@ -711,10 +711,10 @@ public void testGetJsonObjectKeyNotExist() throws Exception {
     final JSONObject jsonAgain = new JSONObject();
     jsonAgain.put("keyAgain", "valueAgain");
     final Map<String, Object> params;
-    params = new HashMap<String, Object>();
+    params = new HashMap<>();
     params.put("key", json);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getJSONObject("wrongKey"));
     //TODO(mengyan) ParseConfig.getJSONObject should return jsonAgain, but due to the error in
     // ParseConfig.getJsonObject, this returns null right now. Revise when we correct the logic
@@ -729,7 +729,7 @@ public void testGetJsonObjectKeyExistValueNotJsonObject() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getJSONObject("key"));
     //TODO(mengyan) ParseConfig.getJSONObject should return json, but due to the error in
     // ParseConfig.getJsonObject, this returns null right now. Revise when we correct the logic
@@ -745,7 +745,7 @@ public void testGetJsonObjectKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getJSONObject("key"));
     assertNull(config.getJSONObject("key", json));
     assertNull(config.getJSONObject("keyAgain"));
@@ -758,22 +758,21 @@ public void testGetJsonObjectKeyExistValueNull() throws Exception {
 
   @Test
   public void testGetJsonArrayKeyExist() throws Exception {
-    final JSONObject json = new JSONObject();
-    json.put("key", "value");
-    final JSONObject jsonAgain = new JSONObject();
-    jsonAgain.put("keyAgain", "valueAgain");
-    final JSONArray jsonArray = new JSONArray();
-    jsonArray.put(0, json);
-    jsonArray.put(1, jsonAgain);
-    final JSONArray jsonArrayAgain = new JSONArray();
-    jsonArray.put(0, jsonAgain);
-    jsonArray.put(1, json);
+    final Map<String, String> map = new HashMap<>();
+    map.put("key", "value");
+    final Map<String, String> mapAgain = new HashMap<>();
+    mapAgain.put("keyAgain", "valueAgain");
+    final List<Map<String, String>> value = new ArrayList<>();
+    value.add(map);
+    value.add(mapAgain);
     final Map<String, Object> params = new HashMap<>();
-    params.put("key", jsonArray);
+    params.put("key", value);
 
-    ParseConfig config = createSampleParseConfig(params);
+    JSONArray jsonArray = new JSONArray(value);
+
+    ParseConfig config = new ParseConfig(params);
     assertEquals(jsonArray, config.getJSONArray("key"), JSONCompareMode.NON_EXTENSIBLE);
-    assertEquals(jsonArray, config.getJSONArray("key", jsonArrayAgain),
+    assertEquals(jsonArray, config.getJSONArray("key", new JSONArray()),
         JSONCompareMode.NON_EXTENSIBLE);
   }
 
@@ -792,7 +791,7 @@ public void testGetJsonArrayKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", jsonArray);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getJSONArray("wrongKey"));
     //TODO(mengyan) ParseConfig.getJSONArray should return default jsonArrayAgain, but due to the
     // error in ParseConfig.getJSONArray, this returns null right now. Revise when we correct the
@@ -812,7 +811,7 @@ public void testGetJsonArrayKeyExistValueNotJsonObject() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getJSONArray("key"));
     //TODO(mengyan) ParseConfig.getJSONArray should return default jsonArray, but due to the
     // error in ParseConfig.getJSONArray, this returns null right now. Revise when we correct the
@@ -832,7 +831,7 @@ public void testGetJsonArrayKeyExistValueNull() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getJSONArray("key"));
     assertNull(config.getJSONArray("key", jsonArray));
     assertNull(config.getJSONArray("keyAgain"));
@@ -850,7 +849,7 @@ public void testGetParseGeoPointKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", geoPoint);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     ParseGeoPoint geoPointConfig = config.getParseGeoPoint("key");
     assertEquals(geoPoint.getLongitude(), geoPointConfig.getLongitude(), 0.0001);
     assertEquals(geoPoint.getLatitude(), geoPointConfig.getLatitude(), 0.0001);
@@ -864,7 +863,7 @@ public void testGetParseGeoPointKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", geoPoint);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getParseGeoPoint("wrongKey"));
     assertSame(geoPointAgain, config.getParseGeoPoint("wrongKey", geoPointAgain));
   }
@@ -875,7 +874,7 @@ public void testGetParseGeoPointKeyExistValueNotParseGeoPoint() throws Exception
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getParseGeoPoint("key"));
     assertSame(geoPoint, config.getParseGeoPoint("key", geoPoint));
   }
@@ -887,7 +886,7 @@ public void testGetParseGeoPointKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", null);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getParseGeoPoint("key"));
     assertNull(config.getParseGeoPoint("key", geoPoint));
     assertNull(config.getParseGeoPoint("keyAgain"));
@@ -907,7 +906,7 @@ public void testGetParseFileKeyExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", file);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     ParseFile fileConfig = config.getParseFile("key");
     assertEquals(file.getName(), fileConfig.getName());
     assertEquals(file.getUrl(), fileConfig.getUrl());
@@ -923,7 +922,7 @@ public void testGetParseFileKeyNotExist() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", file);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getParseFile("wrongKey"));
     assertSame(fileAgain, config.getParseFile("wrongKey", fileAgain));
   }
@@ -935,7 +934,7 @@ public void testGetParseFileKeyExistValueNotParseFile() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("key", 1);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getParseFile("key"));
     assertSame(file, config.getParseFile("key", file));
   }
@@ -948,7 +947,7 @@ public void testGetParseFileKeyExistValueNull() throws Exception {
     params.put("key", JSONObject.NULL);
     params.put("keyAgain", JSONObject.NULL);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     assertNull(config.getParseFile("key"));
     assertNull(config.getParseFile("key", file));
     assertNull(config.getParseFile("keyAgain"));
@@ -969,7 +968,7 @@ public void testToStringList() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("list", list);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     String configStr = config.toString();
     assertTrue(configStr.contains("ParseConfig"));
     assertTrue(configStr.contains("list"));
@@ -987,7 +986,7 @@ public void testToStringMap() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("map", map);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     String configStr = config.toString();
     assertTrue(configStr.contains("ParseConfig"));
     assertTrue(configStr.contains("map"));
@@ -1002,7 +1001,7 @@ public void testToStringParseGeoPoint() throws Exception {
     final Map<String, Object> params = new HashMap<>();
     params.put("geoPoint", geoPoint);
 
-    ParseConfig config = createSampleParseConfig(params);
+    ParseConfig config = new ParseConfig(params);
     String configStr = config.toString();
     assertTrue(configStr.contains("ParseGeoPoint"));
     assertTrue(configStr.contains("45.484"));
@@ -1025,13 +1024,6 @@ private ParseConfigController mockParseConfigControllerWithException(Exception e
     return controller;
   }
 
-  private ParseConfig createSampleParseConfig(final Map<String, Object> params)
-      throws JSONException {
-    JSONObject json = new JSONObject();
-    json.put("params", NoObjectsEncoder.get().encode(params));
-    return new ParseConfig(json, ParseDecoder.get());
-  }
-
   private ParseCurrentConfigController mockParseCurrentConfigControllerWithResponse(
       final ParseConfig result) {
     ParseCurrentConfigController controller = mock(ParseCurrentConfigController.class);
diff --git a/Parse/src/test/java/com/parse/ParseCurrentConfigControllerTest.java b/Parse/src/test/java/com/parse/ParseCurrentConfigControllerTest.java
index 24b7939da..4eba223c5 100644
--- a/Parse/src/test/java/com/parse/ParseCurrentConfigControllerTest.java
+++ b/Parse/src/test/java/com/parse/ParseCurrentConfigControllerTest.java
@@ -12,9 +12,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -87,7 +84,7 @@ public void testSaveToDiskSuccess() throws Exception {
     JSONObject sampleConfigJson = new JSONObject() {{
       put("params", NoObjectsEncoder.get().encode(sampleConfigParameters));
     }};
-    ParseConfig config = new ParseConfig(sampleConfigJson, ParseDecoder.get());
+    ParseConfig config = ParseConfig.decode(sampleConfigJson, ParseDecoder.get());
 
     // Save to disk
     File configFile = new File(temporaryFolder.getRoot(), "config");
@@ -164,7 +161,7 @@ public void testGetFromDiskSuccess() throws Exception {
     JSONObject sampleConfigJson = new JSONObject() {{
       put("params", NoObjectsEncoder.get().encode(sampleConfigParameters));
     }};
-    ParseConfig config = new ParseConfig(sampleConfigJson, ParseDecoder.get());
+    ParseConfig config = ParseConfig.decode(sampleConfigJson, ParseDecoder.get());
 
     // Save to disk
     File configFile = new File(temporaryFolder.getRoot(), "config");
@@ -272,7 +269,7 @@ public void testGetCurrentConfigAsyncSuccessCurrentConfigNotSetDiskConfigExist()
     JSONObject sampleConfigJson = new JSONObject() {{
       put("params", NoObjectsEncoder.get().encode(sampleConfigParameters));
     }};
-    ParseConfig diskConfig = new ParseConfig(sampleConfigJson, ParseDecoder.get());
+    ParseConfig diskConfig = ParseConfig.decode(sampleConfigJson, ParseDecoder.get());
     currentConfigController.saveToDisk(diskConfig);
 
     // Verify before set, disk config exist and in memory config is null
diff --git a/Parse/src/test/java/com/parse/ParseEncoderTest.java b/Parse/src/test/java/com/parse/ParseEncoderTest.java
index 4ef13b14c..5de06ef24 100644
--- a/Parse/src/test/java/com/parse/ParseEncoderTest.java
+++ b/Parse/src/test/java/com/parse/ParseEncoderTest.java
@@ -122,17 +122,6 @@ public void testMap() throws JSONException {
     assertEquals("object2", mapJSON.getString("key2"));
   }
 
-  @Test
-  public void testJSONObject() throws JSONException {
-    JSONObject jsonObject = new JSONObject();
-    jsonObject.put("key1", "object1");
-    JSONObject mapJSON = (JSONObject) testClassObject.encode(jsonObject);
-    assertNotNull(mapJSON);
-    assertNotSame(jsonObject, mapJSON);
-    assertEquals(1, mapJSON.length());
-    assertEquals("object1", mapJSON.getString("key1"));
-  }
-
   @Test
   public void testCollection() throws JSONException {
     ArrayList<Integer> list = new ArrayList<>();
@@ -145,26 +134,6 @@ public void testCollection() throws JSONException {
     assertEquals(2, jsonArray.get(1));
   }
 
-  @Test
-  public void testJSONArray() throws JSONException {
-    JSONArray jsonArray = new JSONArray();
-    ParseGeoPoint parseGeoPoint = new ParseGeoPoint(30, -20);
-    jsonArray.put(parseGeoPoint);
-    Date date = ParseDateFormat.getInstance().parse("2011-08-21T18:02:52.249Z");
-    jsonArray.put(date);
-    jsonArray = (JSONArray) testClassObject.encode(jsonArray);
-    assertNotNull(jsonArray);
-    assertEquals(2, jsonArray.length());
-    JSONObject geoPointJSON = (JSONObject) jsonArray.get(0);
-    final double DELTA = 0.00001;
-    assertEquals("GeoPoint", geoPointJSON.getString("__type"));
-    assertEquals(30, geoPointJSON.getDouble("latitude"), DELTA);
-    assertEquals(-20, geoPointJSON.getDouble("longitude"), DELTA);
-    JSONObject dateJSON = (JSONObject) jsonArray.get(1);
-    assertEquals("Date", dateJSON.getString("__type"));
-    assertEquals("2011-08-21T18:02:52.249Z", dateJSON.getString("iso"));
-  }
-
   @Test
   public void testRelation() throws JSONException {
     ParseRelation parseRelation = new ParseRelation("TestObject");