diff --git a/app/app.iml b/app/app.iml
index da2d840..d5bb4a1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,14 +9,15 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
+        <option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
         <afterSyncTasks>
-          <task>generateDebugAndroidTestSources</task>
           <task>generateDebugSources</task>
+          <task>mockableAndroidJar</task>
+          <task>prepareDebugUnitTestDependencies</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -28,7 +29,7 @@
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -37,12 +38,6 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -50,6 +45,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -57,13 +59,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -73,6 +75,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
@@ -84,10 +87,16 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="pebblekit-2.6.0-eclipse" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockito-core-1.10.19" level="project" />
     <orderEntry type="library" exported="" name="mpandroidchartlibrary-2-0-7" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="objenesis-2.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/androidTest/java/uk.org.openseizuredetector/SdServiceConnection.java b/app/src/androidTest/java/uk.org.openseizuredetector/SdServiceConnection.java
deleted file mode 100644
index ef9d3c3..0000000
--- a/app/src/androidTest/java/uk.org.openseizuredetector/SdServiceConnection.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import org.junit.Test;
-import java.util.regex.Pattern;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class SdServiceConnectionTest {
-
-    @Test
-    public void isconnected_test() {
-        assertThat(SdServiceConnection.isConnected(), is(true));
-    }
-    ...
-}
\ No newline at end of file
diff --git a/app/src/test/java/uk/org/openseizuredetector/MainActivityTest.java b/app/src/test/java/uk/org/openseizuredetector/MainActivityTest.java
new file mode 100644
index 0000000..6d0c854
--- /dev/null
+++ b/app/src/test/java/uk/org/openseizuredetector/MainActivityTest.java
@@ -0,0 +1,46 @@
+package uk.org.openseizuredetector;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by graham on 01/01/16.
+ */
+public class MainActivityTest {
+
+    @Test
+    public void testOnCreate() throws Exception {
+
+    }
+
+    @Test
+    public void testOnCreateOptionsMenu() throws Exception {
+
+    }
+
+    @Test
+    public void testOnOptionsItemSelected() throws Exception {
+
+    }
+
+    @Test
+    public void testOnStart() throws Exception {
+
+    }
+
+    @Test
+    public void testOnStop() throws Exception {
+
+    }
+
+    @Test
+    public void testOnPause() throws Exception {
+
+    }
+
+    @Test
+    public void testOnResume() throws Exception {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/uk/org/openseizuredetector/OsdUtilTest.java b/app/src/test/java/uk/org/openseizuredetector/OsdUtilTest.java
new file mode 100644
index 0000000..64f8e4e
--- /dev/null
+++ b/app/src/test/java/uk/org/openseizuredetector/OsdUtilTest.java
@@ -0,0 +1,26 @@
+package uk.org.openseizuredetector;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by graham on 01/01/16.
+ */
+public class OsdUtilTest {
+
+    @Test
+    public void testIsServerRunning() throws Exception {
+
+    }
+
+    @Test
+    public void testStartServer() throws Exception {
+
+    }
+
+    @Test
+    public void testStopServer() throws Exception {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/uk/org/openseizuredetector/SdDataSourceNetworkTest.java b/app/src/test/java/uk/org/openseizuredetector/SdDataSourceNetworkTest.java
new file mode 100644
index 0000000..ab7c8b6
--- /dev/null
+++ b/app/src/test/java/uk/org/openseizuredetector/SdDataSourceNetworkTest.java
@@ -0,0 +1,36 @@
+package uk.org.openseizuredetector;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by graham on 01/01/16.
+ */
+public class SdDataSourceNetworkTest {
+
+    @Test
+    public void testStart() throws Exception {
+
+    }
+
+    @Test
+    public void testStop() throws Exception {
+
+    }
+
+    @Test
+    public void testUpdatePrefs() throws Exception {
+
+    }
+
+    @Test
+    public void testDownloadSdData() throws Exception {
+
+    }
+
+    @Test
+    public void testReadInputStream() throws Exception {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/uk/org/openseizuredetector/SdDataSourcePebbleTest.java b/app/src/test/java/uk/org/openseizuredetector/SdDataSourcePebbleTest.java
new file mode 100644
index 0000000..e7e5f7f
--- /dev/null
+++ b/app/src/test/java/uk/org/openseizuredetector/SdDataSourcePebbleTest.java
@@ -0,0 +1,51 @@
+package uk.org.openseizuredetector;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by graham on 01/01/16.
+ */
+public class SdDataSourcePebbleTest {
+
+    @Test
+    public void testStart() throws Exception {
+
+    }
+
+    @Test
+    public void testStop() throws Exception {
+
+    }
+
+    @Test
+    public void testUpdatePrefs() throws Exception {
+
+    }
+
+    @Test
+    public void testStopPebbleServer() throws Exception {
+
+    }
+
+    @Test
+    public void testStartWatchApp() throws Exception {
+
+    }
+
+    @Test
+    public void testStopWatchApp() throws Exception {
+
+    }
+
+    @Test
+    public void testGetPebbleSdSettings() throws Exception {
+
+    }
+
+    @Test
+    public void testGetPebbleStatus() throws Exception {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/uk/org/openseizuredetector/SdServerTest.java b/app/src/test/java/uk/org/openseizuredetector/SdServerTest.java
new file mode 100644
index 0000000..890f286
--- /dev/null
+++ b/app/src/test/java/uk/org/openseizuredetector/SdServerTest.java
@@ -0,0 +1,141 @@
+package uk.org.openseizuredetector;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by graham on 01/01/16.
+ */
+public class SdServerTest {
+
+    @Test
+    public void testOnBind() throws Exception {
+
+    }
+
+    @Test
+    public void testOnCreate() throws Exception {
+
+    }
+
+    @Test
+    public void testOnStartCommand() throws Exception {
+
+    }
+
+    @Test
+    public void testOnDestroy() throws Exception {
+
+    }
+
+    @Test
+    public void testOnSdDataReceived() throws Exception {
+
+    }
+
+    @Test
+    public void testOnSdDataFault() throws Exception {
+
+    }
+
+    @Test
+    public void testFaultWarningBeep() throws Exception {
+
+    }
+
+    @Test
+    public void testAlarmBeep() throws Exception {
+
+    }
+
+    @Test
+    public void testWarningBeep() throws Exception {
+
+    }
+
+    @Test
+    public void testSendSMSAlarm() throws Exception {
+
+    }
+
+    @Test
+    public void testAcceptAlarm() throws Exception {
+
+    }
+
+    @Test
+    public void testCancelAudible() throws Exception {
+
+    }
+
+    @Test
+    public void testIsAudibleCancelled() throws Exception {
+
+    }
+
+    @Test
+    public void testCancelAudibleTimeRemaining() throws Exception {
+
+    }
+
+    @Test
+    public void testIsLatchAlarms() throws Exception {
+
+    }
+
+    @Test
+    public void testStartWebServer() throws Exception {
+
+    }
+
+    @Test
+    public void testStopWebServer() throws Exception {
+
+    }
+
+    @Test
+    public void testLogData() throws Exception {
+
+    }
+
+    @Test
+    public void testUpdatePrefs() throws Exception {
+
+    }
+
+    @Test
+    public void testIsExternalStorageWritable() throws Exception {
+
+    }
+
+    @Test
+    public void testGetDataStorageDir() throws Exception {
+
+    }
+
+    @Test
+    public void testWriteAlarmToSD() throws Exception {
+
+    }
+
+    @Test
+    public void testWriteToSD() throws Exception {
+
+    }
+
+    @Test
+    public void testWriteToSD1() throws Exception {
+
+    }
+
+    @Test
+    public void testStartFaultTimer() throws Exception {
+
+    }
+
+    @Test
+    public void testStopFaultTimer() throws Exception {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/uk/org/openseizuredetector/SdServiceConnectionTest.java b/app/src/test/java/uk/org/openseizuredetector/SdServiceConnectionTest.java
new file mode 100644
index 0000000..0e50e3b
--- /dev/null
+++ b/app/src/test/java/uk/org/openseizuredetector/SdServiceConnectionTest.java
@@ -0,0 +1,41 @@
+package uk.org.openseizuredetector;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Created by graham on 01/01/16.
+ */
+public class SdServiceConnectionTest {
+
+    @Test
+    public void testOnServiceConnected() throws Exception {
+
+    }
+
+    @Test
+    public void testOnServiceDisconnected() throws Exception {
+
+    }
+
+    @Test
+    public void testHasSdData() throws Exception {
+
+    }
+
+    @Test
+    public void testHasSdSettings() throws Exception {
+
+    }
+
+    @Test
+    public void testPebbleConnected() throws Exception {
+
+    }
+
+    @Test
+    public void testPebbleAppRunning() throws Exception {
+
+    }
+}
\ No newline at end of file