diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb68289f4..5d19981032 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..8429db4b11
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: android
+jdk: oraclejdk8
+env:
+  matrix:
+    - ANDROID_TARGET=android-23 ANDROID_ABI=x86
+android:
+  components:
+  - platform-tools
+  - tools
+  - build-tools-25.0.2
+  - android-23
+  - extra-google-m2repository
+  - extra-android-m2repository
+  - extra-google-google_play_services
+  
+script:
+  # Unit Test
+  - ./gradlew test
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 21b5236a26..aee236a796 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,7 +37,7 @@ def generateGitBuild = { ->
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "info.nightscout.androidaps"
diff --git a/app/src/test/info/nightscout/utils/RoundTest.java b/app/src/test/info/nightscout/utils/RoundTest.java
new file mode 100644
index 0000000000..91bce62014
--- /dev/null
+++ b/app/src/test/info/nightscout/utils/RoundTest.java
@@ -0,0 +1,27 @@
+package info.nightscout.utils;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class RoundTest {
+
+    @Test
+    public void roundTo() {
+        assertEquals( 0.55d, Round.roundTo(0.54d, 0.05d), 0.00000001d );
+        assertEquals( 1d, Round.roundTo(1.49d, 1d), 0.00000001d );
+    }
+
+    @Test
+    public void floorTo() {
+        assertEquals( 0.5d, Round.floorTo(0.54d, 0.05d), 0.00000001d );
+        assertEquals( 1d, Round.floorTo(1.59d, 1d), 0.00000001d );
+    }
+
+    @Test
+    public void ceilTo() {
+        assertEquals( 0.6d, Round.ceilTo(0.54d, 0.1d), 0.00000001d );
+        assertEquals( 2d, Round.ceilTo(1.49999d, 1d), 0.00000001d );
+    }
+
+}
\ No newline at end of file
diff --git a/wear/build.gradle b/wear/build.gradle
index 3906ab934a..97fb7b78c0 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "info.nightscout.androidaps"
diff --git a/wear/wear.iml b/wear/wear.iml
index 008bad09ce..3128c10a22 100644
--- a/wear/wear.iml
+++ b/wear/wear.iml
@@ -106,14 +106,6 @@
       <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/main/shaders" isTestSource="false" />
-      <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" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <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" />
@@ -122,6 +114,14 @@
       <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/androidTest/shaders" 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" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />