diff --git a/build.gradle b/build.gradle
index b1557280..a3330d48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
+        classpath 'com.android.tools.build:gradle:2.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/camerakit/build.gradle b/camerakit/build.gradle
index 9fad735d..db38fd47 100644
--- a/camerakit/build.gradle
+++ b/camerakit/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'com.flurgle'
     PUBLISH_ARTIFACT_ID = 'camerakit'
-    PUBLISH_VERSION = '0.9.0'
+    PUBLISH_VERSION = '0.9.5'
 }
 
 android {
diff --git a/camerakit/src/androidTest/java/com/flurgle/camerakit/ExampleInstrumentedTest.java b/camerakit/src/androidTest/java/com/flurgle/camerakit/ExampleInstrumentedTest.java
deleted file mode 100644
index fb837d6f..00000000
--- a/camerakit/src/androidTest/java/com/flurgle/camerakit/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.flurgle.camerakit;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.flurgle.camerakit.test", appContext.getPackageName());
-    }
-}
diff --git a/camerakit/src/test/java/com/flurgle/camerakit/ExampleUnitTest.java b/camerakit/src/test/java/com/flurgle/camerakit/ExampleUnitTest.java
deleted file mode 100644
index e500dde1..00000000
--- a/camerakit/src/test/java/com/flurgle/camerakit/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.flurgle.camerakit;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/demo/src/androidTest/java/com/flurgle/camerakit/demo/ExampleInstrumentedTest.java b/demo/src/androidTest/java/com/flurgle/camerakit/demo/ExampleInstrumentedTest.java
deleted file mode 100644
index 502d5946..00000000
--- a/demo/src/androidTest/java/com/flurgle/camerakit/demo/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.flurgle.camerakit.demo;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.flurgle.camerakit.demo", appContext.getPackageName());
-    }
-}
diff --git a/demo/src/test/java/com/flurgle/camerakit/demo/ExampleUnitTest.java b/demo/src/test/java/com/flurgle/camerakit/demo/ExampleUnitTest.java
deleted file mode 100644
index f82282ff..00000000
--- a/demo/src/test/java/com/flurgle/camerakit/demo/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.flurgle.camerakit.demo;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file