diff --git a/pom.xml b/pom.xml
index 665edc8a6..b13382689 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,12 +465,6 @@
             <version>0.6</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.cedarsoftware</groupId>
-            <artifactId>java-util</artifactId>
-            <version>1.26.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/src/main/java/com/google/firebase/messaging/LightSettings.java b/src/main/java/com/google/firebase/messaging/LightSettings.java
index 75a692090..e0e898374 100644
--- a/src/main/java/com/google/firebase/messaging/LightSettings.java
+++ b/src/main/java/com/google/firebase/messaging/LightSettings.java
@@ -61,7 +61,7 @@ private Builder() {}
     /**
      * Sets the lightSettingsColor value with a string.   
      *
-     * @param lightSettingsColor LightSettingsColor specified in the {@code #rrggbb} format.
+     * @param color LightSettingsColor specified in the {@code #rrggbb} format.
      * @return This builder.
      */
     public Builder setColorFromString(String color) {
@@ -72,7 +72,7 @@ public Builder setColorFromString(String color) {
     /**
      * Sets the lightSettingsColor value in the light settings.   
      *
-     * @param lightSettingsColor Color to be used in the light settings.
+     * @param color Color to be used in the light settings.
      * @return This builder.
      */
     public Builder setColor(LightSettingsColor color) {
diff --git a/src/main/java/com/google/firebase/messaging/Notification.java b/src/main/java/com/google/firebase/messaging/Notification.java
index efed46deb..a8f48c2ef 100644
--- a/src/main/java/com/google/firebase/messaging/Notification.java
+++ b/src/main/java/com/google/firebase/messaging/Notification.java
@@ -40,9 +40,9 @@ private Notification(Builder builder) {
   }
 
   /**
-   * Creates a new {@link Notification.Builder}.
+   * Creates a new {@link Builder}.
    *
-   * @return A {@link Notification.Builder} instance.
+   * @return A {@link Builder} instance.
    */
   public static Builder builder() {
     return new Builder();
diff --git a/src/test/java/com/google/firebase/database/TestHelpers.java b/src/test/java/com/google/firebase/database/TestHelpers.java
index cfd15034d..00d9a3797 100644
--- a/src/test/java/com/google/firebase/database/TestHelpers.java
+++ b/src/test/java/com/google/firebase/database/TestHelpers.java
@@ -16,7 +16,6 @@
 
 package com.google.firebase.database;
 
-import static com.cedarsoftware.util.DeepEquals.deepEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -43,6 +42,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.Executors;
@@ -241,7 +241,7 @@ public static void setHijackHash(DatabaseReference ref, boolean hijackHash) {
    * a true and more effective super set.
    */
   public static void assertDeepEquals(Object a, Object b) {
-    if (!deepEquals(a, b)) {
+    if (!Objects.deepEquals(a, b)) {
       fail("Values different.\nExpected: " + a + "\nActual: " + b);
     }
   }
diff --git a/src/test/java/com/google/firebase/database/ValueExpectationHelper.java b/src/test/java/com/google/firebase/database/ValueExpectationHelper.java
index f7f15a03d..9732bf73b 100644
--- a/src/test/java/com/google/firebase/database/ValueExpectationHelper.java
+++ b/src/test/java/com/google/firebase/database/ValueExpectationHelper.java
@@ -18,10 +18,10 @@
 
 import static org.junit.Assert.fail;
 
-import com.cedarsoftware.util.DeepEquals;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.Semaphore;
 
 public class ValueExpectationHelper {
@@ -39,7 +39,7 @@ public void add(final Query query, final Object expected) {
               public void onDataChange(DataSnapshot snapshot) {
                 Object result = snapshot.getValue();
                 // Hack to handle race condition in initial data
-                if (DeepEquals.deepEquals(expected, result)) {
+                if (Objects.deepEquals(expected, result)) {
                   // We may pass through intermediate states, but we should end up with
                   // the correct
                   // state
diff --git a/src/test/java/com/google/firebase/database/collection/RBTreeSortedMapTest.java b/src/test/java/com/google/firebase/database/collection/RBTreeSortedMapTest.java
index 2fbc8ba90..f29ef208a 100644
--- a/src/test/java/com/google/firebase/database/collection/RBTreeSortedMapTest.java
+++ b/src/test/java/com/google/firebase/database/collection/RBTreeSortedMapTest.java
@@ -262,7 +262,7 @@ public void successorKeyIsCorrect() {
         lastKey = entry.getKey();
       }
       if (lastKey != null) {
-        assertEquals(null, map.getSuccessorKey(lastKey));
+        assertNull(map.getSuccessorKey(lastKey));
       }
     }
   }
@@ -295,13 +295,13 @@ public int compare(Integer o1, Integer o2) {
       arraycopy = arraycopy.insert(key, value);
       copyWithDifferentComparator = copyWithDifferentComparator.insert(key, value);
     }
-    Assert.assertTrue(map.equals(copy));
-    Assert.assertTrue(map.equals(arraycopy));
-    Assert.assertTrue(arraycopy.equals(map));
-
-    Assert.assertFalse(map.equals(copyWithDifferentComparator));
-    Assert.assertFalse(map.equals(copy.remove(copy.getMaxKey())));
-    Assert.assertFalse(map.equals(copy.insert(copy.getMaxKey() + 1, 1)));
-    Assert.assertFalse(map.equals(arraycopy.remove(arraycopy.getMaxKey())));
+    Assert.assertEquals(map, copy);
+    Assert.assertEquals(map, arraycopy);
+    Assert.assertEquals(arraycopy, map);
+
+    Assert.assertNotEquals(map, copyWithDifferentComparator);
+    Assert.assertNotEquals(map, copy.remove(copy.getMaxKey()));
+    Assert.assertNotEquals(map, copy.insert(copy.getMaxKey() + 1, 1));
+    Assert.assertNotEquals(map, arraycopy.remove(arraycopy.getMaxKey()));
   }
 }
diff --git a/src/test/java/com/google/firebase/database/core/JvmAuthTokenProviderTest.java b/src/test/java/com/google/firebase/database/core/JvmAuthTokenProviderTest.java
index fd9089ce4..9bc55950b 100644
--- a/src/test/java/com/google/firebase/database/core/JvmAuthTokenProviderTest.java
+++ b/src/test/java/com/google/firebase/database/core/JvmAuthTokenProviderTest.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.cedarsoftware.util.DeepEquals;
 import com.google.auth.oauth2.AccessToken;
 import com.google.auth.oauth2.OAuth2Credentials;
 import com.google.common.collect.ImmutableMap;
@@ -38,6 +37,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -235,7 +235,7 @@ private void assertToken(String token, String expectedToken, Map<String, Object>
     assertEquals(expectedToken, map.get("token"));
 
     Map auth = (Map) map.get("auth");
-    DeepEquals.deepEquals(expectedAuth, auth);
+    assertTrue(Objects.deepEquals(expectedAuth, auth));
   }
 
   private static class TestGetTokenListener
diff --git a/src/test/java/com/google/firebase/database/integration/DataTestIT.java b/src/test/java/com/google/firebase/database/integration/DataTestIT.java
index 2b2124a14..d832f995d 100644
--- a/src/test/java/com/google/firebase/database/integration/DataTestIT.java
+++ b/src/test/java/com/google/firebase/database/integration/DataTestIT.java
@@ -24,7 +24,6 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.cedarsoftware.util.DeepEquals;
 import com.google.common.collect.ImmutableList;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.database.ChildEventListener;
@@ -56,6 +55,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Semaphore;
@@ -1645,7 +1645,7 @@ public void testUpdateAfterSetLeafNodeWorks() throws InterruptedException {
     ref.addValueEventListener(new ValueEventListener() {
       @Override
       public void onDataChange(DataSnapshot snapshot) {
-        if (DeepEquals.deepEquals(snapshot.getValue(), expected)) {
+        if (Objects.deepEquals(snapshot.getValue(), expected)) {
           semaphore.release();
         }
       }
diff --git a/src/test/java/com/google/firebase/testing/IntegrationTestUtils.java b/src/test/java/com/google/firebase/testing/IntegrationTestUtils.java
index 0e801f005..c9890354e 100644
--- a/src/test/java/com/google/firebase/testing/IntegrationTestUtils.java
+++ b/src/test/java/com/google/firebase/testing/IntegrationTestUtils.java
@@ -110,7 +110,6 @@ public static synchronized FirebaseApp ensureDefaultApp() {
               .setStorageBucket(getStorageBucket())
               .setCredentials(TestUtils.getCertCredential(getServiceAccountCertificate()))
               .setFirestoreOptions(FirestoreOptions.newBuilder()
-                  .setTimestampsInSnapshotsEnabled(true)
                   .setCredentials(TestUtils.getCertCredential(getServiceAccountCertificate()))
                   .build())
               .build();