diff --git a/library/src/androidTest/java/com/firebase/ui/ApplicationTest.java b/library/src/test/java/com/firebase/ui/database/ApplicationTest.java
similarity index 97%
rename from library/src/androidTest/java/com/firebase/ui/ApplicationTest.java
rename to library/src/test/java/com/firebase/ui/database/ApplicationTest.java
index 3347e1d6d..a788de9df 100644
--- a/library/src/androidTest/java/com/firebase/ui/ApplicationTest.java
+++ b/library/src/test/java/com/firebase/ui/database/ApplicationTest.java
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.firebase.ui;
+package com.firebase.ui.database;
 
 import android.app.Application;
 import android.content.Context;
diff --git a/library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java b/library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java
similarity index 95%
rename from library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java
rename to library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java
index aedaac9e7..4ec54991e 100644
--- a/library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java
+++ b/library/src/test/java/com/firebase/ui/database/FirebaseArrayOfObjectsTest.java
@@ -16,9 +16,8 @@
 
 import android.test.AndroidTestCase;
 
-import com.firebase.ui.ApplicationTest;
-import com.firebase.ui.database.FirebaseArray;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.Query;
@@ -173,9 +172,14 @@ private Bean getBean(FirebaseArray array, int index) {
     public static void runAndWaitUntil(final FirebaseArray array, Query ref, Runnable task, Callable<Boolean> done) throws InterruptedException {
         final java.util.concurrent.Semaphore semaphore = new java.util.concurrent.Semaphore(0);
         array.setOnChangedListener(new FirebaseArray.OnChangedListener() {
-            public void onChanged(FirebaseArray.OnChangedListener.EventType type, int index, int oldIndex) {
+            public void onChanged(EventType type, int index, int oldIndex) {
                 semaphore.release();
             }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+                throw new IllegalStateException(databaseError.toException());
+            }
         });
         task.run();
         boolean isDone = false;
diff --git a/library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java b/library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java
similarity index 94%
rename from library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java
rename to library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java
index 8fb5dcddd..0332f020c 100644
--- a/library/src/androidTest/java/com/firebase/ui/database/FirebaseArrayTest.java
+++ b/library/src/test/java/com/firebase/ui/database/FirebaseArrayTest.java
@@ -16,8 +16,8 @@
 
 import android.test.AndroidTestCase;
 
-import com.firebase.ui.ApplicationTest;
 import com.google.firebase.FirebaseApp;
+import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.Query;
@@ -143,9 +143,14 @@ private static void print(FirebaseArray array) {
     public static void runAndWaitUntil(final FirebaseArray array, Query ref, Runnable task, Callable<Boolean> done) throws InterruptedException {
         final java.util.concurrent.Semaphore semaphore = new java.util.concurrent.Semaphore(0);
         array.setOnChangedListener(new FirebaseArray.OnChangedListener() {
-            public void onChanged(FirebaseArray.OnChangedListener.EventType type, int index, int oldIndex) {
+            public void onChanged(EventType type, int index, int oldIndex) {
                 semaphore.release();
             }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+                throw new IllegalStateException(databaseError.toException());
+            }
         });
         task.run();
         boolean isDone = false;