diff --git a/tests/.project b/tests/.project
new file mode 100644
index 0000000..dcac2b9
--- /dev/null
+++ b/tests/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>tests</name>
+	<comment>Project tests created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/.settings/org.eclipse.buildship.core.prefs b/tests/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 0000000..306a8c8
--- /dev/null
+++ b/tests/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,13 @@
+arguments=
+auto.sync=false
+build.scans.enabled=false
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3))
+connection.project.dir=
+eclipse.preferences.version=1
+gradle.user.home=
+java.home=/usr/lib/jvm/java-11-openjdk-amd64
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true
diff --git a/tests/src/androidTest/java/io/realm/.RealmRecyclerAdapterTests.java.swp b/tests/src/androidTest/java/io/realm/.RealmRecyclerAdapterTests.java.swp
new file mode 100644
index 0000000..8d5860b
Binary files /dev/null and b/tests/src/androidTest/java/io/realm/.RealmRecyclerAdapterTests.java.swp differ
diff --git a/tests/src/androidTest/java/io/realm/RealmRecyclerAdapterTests.java b/tests/src/androidTest/java/io/realm/RealmRecyclerAdapterTests.java
index f197948..eb258d8 100644
--- a/tests/src/androidTest/java/io/realm/RealmRecyclerAdapterTests.java
+++ b/tests/src/androidTest/java/io/realm/RealmRecyclerAdapterTests.java
@@ -68,16 +68,12 @@ public void tearDown() {
         realm.close();
     }
 
-    @Test
+    @Test(expected = IllegalStateException.class)
     @UiThreadTest
     public void constructor_testRecyclerAdapterUnmanagedParameterExceptions() {
         RealmResults<AllJavaTypes> resultList = realm.where(AllJavaTypes.class).findAll();
         RealmList<AllJavaTypes> unmanagedRealmList = new RealmList<>(resultList.toArray(new AllJavaTypes[0]));
-        try {
-            new RecyclerViewTestAdapter(context, unmanagedRealmList, true);
-            fail("Should throw exception if list is un-managed");
-        } catch (IllegalStateException ignore) {
-        }
+        new RecyclerViewTestAdapter(context, unmanagedRealmList, true);
     }
 
     @Test
@@ -135,17 +131,14 @@ public void updateData_replaceInvalidData() {
         realmAdapter.updateData(resultList);
     }
 
-    @Test
+    @Test (expected = IllegalArgumentException.class)
     @UiThreadTest
     public void updateData_realmUnsupportedCollectionInAdapter() {
-        try {
-            RecyclerViewTestAdapter realmAdapter = new RecyclerViewTestAdapter(context, null, AUTOMATIC_UPDATE);
-            RealmResults<AllJavaTypes> results =
-                    realm.where(AllJavaTypes.class).sort(AllJavaTypes.FIELD_STRING).findAll();
-            realmAdapter.updateData(results.createSnapshot());
-            fail("Should throw exception if there is unsupported collection");
-        } catch (IllegalArgumentException ignore) {
-        }
+        RecyclerViewTestAdapter realmAdapter = new RecyclerViewTestAdapter(context, null, AUTOMATIC_UPDATE);
+        RealmResults<AllJavaTypes> results =
+                realm.where(AllJavaTypes.class).sort(AllJavaTypes.FIELD_STRING).findAll();
+        realmAdapter.updateData(results.createSnapshot());
+
     }
 
     @Test