diff --git a/app/build.gradle b/app/build.gradle
index b7e988bb1..f224ae953 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,6 +71,7 @@ dependencies {
     compile project(':libs:drag-sort-listview:library')
 
     testCompile 'junit:junit:4.12'
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'org.mockito:mockito-core:1.10.19'
 
     androidTestCompile 'com.android.support:support-annotations:23.3.0'
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/ArchiveHabitsCommandTest.java b/app/src/test/java/org/isoron/uhabits/commands/ArchiveHabitsCommandTest.java
similarity index 69%
rename from app/src/androidTest/java/org/isoron/uhabits/unit/commands/ArchiveHabitsCommandTest.java
rename to app/src/test/java/org/isoron/uhabits/commands/ArchiveHabitsCommandTest.java
index 7c0b492f0..3ef68aaed 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/ArchiveHabitsCommandTest.java
+++ b/app/src/test/java/org/isoron/uhabits/commands/ArchiveHabitsCommandTest.java
@@ -17,31 +17,23 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.unit.commands;
+package org.isoron.uhabits.commands;
 
-import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.models.*;
+import org.junit.*;
 
-import org.isoron.uhabits.BaseAndroidTest;
-import org.isoron.uhabits.commands.ArchiveHabitsCommand;
-import org.isoron.uhabits.models.Habit;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import java.util.*;
 
-import java.util.Collections;
+import static junit.framework.Assert.*;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ArchiveHabitsCommandTest extends BaseAndroidTest
+public class ArchiveHabitsCommandTest extends BaseUnitTest
 {
 
     private ArchiveHabitsCommand command;
     private Habit habit;
 
+    @Override
     @Before
     public void setUp()
     {
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/ChangeHabitColorCommandTest.java b/app/src/test/java/org/isoron/uhabits/commands/ChangeHabitColorCommandTest.java
similarity index 70%
rename from app/src/androidTest/java/org/isoron/uhabits/unit/commands/ChangeHabitColorCommandTest.java
rename to app/src/test/java/org/isoron/uhabits/commands/ChangeHabitColorCommandTest.java
index c41656c29..70d60bad5 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/ChangeHabitColorCommandTest.java
+++ b/app/src/test/java/org/isoron/uhabits/commands/ChangeHabitColorCommandTest.java
@@ -17,30 +17,24 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.unit.commands;
+package org.isoron.uhabits.commands;
 
-import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.models.*;
+import org.junit.*;
 
-import org.isoron.uhabits.BaseAndroidTest;
-import org.isoron.uhabits.commands.ChangeHabitColorCommand;
-import org.isoron.uhabits.models.Habit;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import java.util.*;
 
-import java.util.LinkedList;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ChangeHabitColorCommandTest extends BaseAndroidTest
+public class ChangeHabitColorCommandTest extends BaseUnitTest
 {
     private ChangeHabitColorCommand command;
+
     private LinkedList<Habit> habits;
 
+    @Override
     @Before
     public void setUp()
     {
@@ -48,7 +42,7 @@ public class ChangeHabitColorCommandTest extends BaseAndroidTest
 
         habits = new LinkedList<>();
 
-        for(int i = 0; i < 3; i ++)
+        for (int i = 0; i < 3; i++)
         {
             Habit habit = fixtures.createShortHabit();
             habit.setColor(i + 1);
@@ -73,16 +67,16 @@ public class ChangeHabitColorCommandTest extends BaseAndroidTest
         checkNewColors();
     }
 
-    private void checkOriginalColors()
+    private void checkNewColors()
     {
-        int k = 0;
-        for(Habit h : habits)
-            assertThat(h.getColor(), equalTo(++k));
+        for (Habit h : habits)
+            assertThat(h.getColor(), equalTo(0));
     }
 
-    private void checkNewColors()
+    private void checkOriginalColors()
     {
-        for(Habit h : habits)
-            assertThat(h.getColor(), equalTo(0));
+        int k = 0;
+        for (Habit h : habits)
+            assertThat(h.getColor(), equalTo(++k));
     }
 }
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/CreateHabitCommandTest.java b/app/src/test/java/org/isoron/uhabits/commands/CreateHabitCommandTest.java
similarity index 72%
rename from app/src/androidTest/java/org/isoron/uhabits/unit/commands/CreateHabitCommandTest.java
rename to app/src/test/java/org/isoron/uhabits/commands/CreateHabitCommandTest.java
index 3c3f9ebfb..f5adaf27d 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/CreateHabitCommandTest.java
+++ b/app/src/test/java/org/isoron/uhabits/commands/CreateHabitCommandTest.java
@@ -17,33 +17,26 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.unit.commands;
+package org.isoron.uhabits.commands;
 
-import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.models.*;
+import org.junit.*;
 
-import org.isoron.uhabits.BaseAndroidTest;
-import org.isoron.uhabits.commands.CreateHabitCommand;
-import org.isoron.uhabits.models.Habit;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import java.util.*;
 
-import java.util.List;
+import static junit.framework.Assert.*;
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
 
-import static junit.framework.Assert.assertTrue;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class CreateHabitCommandTest extends BaseAndroidTest
+public class CreateHabitCommandTest extends BaseUnitTest
 {
 
     private CreateHabitCommand command;
 
     private Habit model;
 
+    @Override
     @Before
     public void setUp()
     {
@@ -52,8 +45,7 @@ public class CreateHabitCommandTest extends BaseAndroidTest
         model = new Habit();
         model.setName("New habit");
         command = new CreateHabitCommand(model);
-
-        fixtures.purgeHabits(habitList);
+        fixtures.purgeHabits();
     }
 
     @Test
@@ -82,4 +74,6 @@ public class CreateHabitCommandTest extends BaseAndroidTest
         assertThat(id, equalTo(newId));
         assertThat(habit.getName(), equalTo(model.getName()));
     }
+
+
 }
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/DeleteHabitsCommandTest.java b/app/src/test/java/org/isoron/uhabits/commands/DeleteHabitsCommandTest.java
similarity index 82%
rename from app/src/androidTest/java/org/isoron/uhabits/unit/commands/DeleteHabitsCommandTest.java
rename to app/src/test/java/org/isoron/uhabits/commands/DeleteHabitsCommandTest.java
index 565a5fdd9..28055da8b 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/DeleteHabitsCommandTest.java
+++ b/app/src/test/java/org/isoron/uhabits/commands/DeleteHabitsCommandTest.java
@@ -17,26 +17,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.unit.commands;
-
-import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
+package org.isoron.uhabits.commands;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.commands.*;
 import org.isoron.uhabits.models.*;
 import org.junit.*;
 import org.junit.rules.*;
-import org.junit.runner.*;
 
 import java.util.*;
 
-import static org.hamcrest.MatcherAssert.*;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DeleteHabitsCommandTest extends BaseAndroidTest
+public class DeleteHabitsCommandTest extends BaseUnitTest
 {
     private DeleteHabitsCommand command;
 
@@ -51,7 +44,7 @@ public class DeleteHabitsCommandTest extends BaseAndroidTest
     {
         super.setUp();
 
-        fixtures.purgeHabits(habitList);
+        fixtures.purgeHabits();
         habits = new LinkedList<>();
 
         // Habits that should be deleted
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/EditHabitCommandTest.java b/app/src/test/java/org/isoron/uhabits/commands/EditHabitCommandTest.java
similarity index 82%
rename from app/src/androidTest/java/org/isoron/uhabits/unit/commands/EditHabitCommandTest.java
rename to app/src/test/java/org/isoron/uhabits/commands/EditHabitCommandTest.java
index a196c064d..8f7fc1a1c 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/EditHabitCommandTest.java
+++ b/app/src/test/java/org/isoron/uhabits/commands/EditHabitCommandTest.java
@@ -17,25 +17,16 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.unit.commands;
+package org.isoron.uhabits.commands;
 
-import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.models.*;
+import org.junit.*;
 
-import org.isoron.uhabits.BaseAndroidTest;
-import org.isoron.uhabits.commands.EditHabitCommand;
-import org.isoron.uhabits.models.Habit;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class EditHabitCommandTest extends BaseAndroidTest
+public class EditHabitCommandTest extends BaseUnitTest
 {
 
     private EditHabitCommand command;
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/ToggleRepetitionCommandTest.java b/app/src/test/java/org/isoron/uhabits/commands/ToggleRepetitionCommandTest.java
similarity index 71%
rename from app/src/androidTest/java/org/isoron/uhabits/unit/commands/ToggleRepetitionCommandTest.java
rename to app/src/test/java/org/isoron/uhabits/commands/ToggleRepetitionCommandTest.java
index 934d8e654..e9e5fd0a7 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/ToggleRepetitionCommandTest.java
+++ b/app/src/test/java/org/isoron/uhabits/commands/ToggleRepetitionCommandTest.java
@@ -17,31 +17,23 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.unit.commands;
+package org.isoron.uhabits.commands;
 
-import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.models.*;
+import org.isoron.uhabits.utils.*;
+import org.junit.*;
 
-import org.isoron.uhabits.BaseAndroidTest;
-import org.isoron.uhabits.commands.ToggleRepetitionCommand;
-import org.isoron.uhabits.models.Habit;
-import org.isoron.uhabits.utils.DateUtils;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static junit.framework.Assert.*;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class ToggleRepetitionCommandTest extends BaseAndroidTest
+public class ToggleRepetitionCommandTest extends BaseUnitTest
 {
 
     private ToggleRepetitionCommand command;
     private Habit habit;
     private long today;
 
+    @Override
     @Before
     public void setUp()
     {
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/UnarchiveHabitsCommandTest.java b/app/src/test/java/org/isoron/uhabits/commands/UnarchiveHabitsCommandTest.java
similarity index 70%
rename from app/src/androidTest/java/org/isoron/uhabits/unit/commands/UnarchiveHabitsCommandTest.java
rename to app/src/test/java/org/isoron/uhabits/commands/UnarchiveHabitsCommandTest.java
index d9235599b..1c952e663 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/commands/UnarchiveHabitsCommandTest.java
+++ b/app/src/test/java/org/isoron/uhabits/commands/UnarchiveHabitsCommandTest.java
@@ -17,26 +17,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package org.isoron.uhabits.unit.commands;
+package org.isoron.uhabits.commands;
 
-import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.SmallTest;
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.models.*;
+import org.junit.*;
 
-import org.isoron.uhabits.BaseAndroidTest;
-import org.isoron.uhabits.commands.UnarchiveHabitsCommand;
-import org.isoron.uhabits.models.Habit;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import java.util.*;
 
-import java.util.Collections;
+import static junit.framework.Assert.*;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class UnarchiveHabitsCommandTest extends BaseAndroidTest
+public class UnarchiveHabitsCommandTest extends BaseUnitTest
 {
     private UnarchiveHabitsCommand command;
     private Habit habit;