diff --git a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
similarity index 100%
rename from tests-sync/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
rename to tests/src/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java
diff --git a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
similarity index 89%
rename from tests-sync/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
rename to tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
index 293b40af2..f0e480602 100644
--- a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java
@@ -8,6 +8,7 @@ import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Metadata;
+import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
@@ -19,6 +20,7 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
     @Autowired private GtasksTaskListUpdater gtasksTaskListUpdater;
 
     private Task task;
+    private StoreObject storeList;
 
     public void testIndentWithoutMetadata() {
         givenTask(taskWithoutMetadata());
@@ -118,11 +120,11 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
     // --- helpers
 
     private void whenIncreaseIndent() {
-        gtasksTaskListUpdater.indent(task.getId(), 1);
+        gtasksTaskListUpdater.indent(null, storeList, task.getId(), 1);
     }
 
     private void whenDecreaseIndent() {
-        gtasksTaskListUpdater.indent(task.getId(), -1);
+        gtasksTaskListUpdater.indent(null, storeList, task.getId(), -1);
     }
 
     @Override
@@ -137,18 +139,20 @@ public class GtasksIndentActionTest extends DatabaseTestCase {
         items.add(list);
         lists.setItems(items);
         gtasksListService.updateLists(lists);
+
+        storeList = gtasksListService.getLists()[0];
     }
 
     private Task taskWithMetadata(long order, int indentation) {
-        Task task = new Task();
-        PluginServices.getTaskService().save(task);
-        Metadata metadata = GtasksMetadata.createEmptyMetadata(task.getId());
+        Task newTask = new Task();
+        PluginServices.getTaskService().save(newTask);
+        Metadata metadata = GtasksMetadata.createEmptyMetadata(newTask.getId());
         metadata.setValue(GtasksMetadata.INDENT, indentation);
         metadata.setValue(GtasksMetadata.ORDER, order);
         metadata.setValue(GtasksMetadata.LIST_ID, "list");
-        metadata.setValue(Metadata.TASK, task.getId());
+        metadata.setValue(Metadata.TASK, newTask.getId());
         PluginServices.getMetadataService().save(metadata);
-        return task;
+        return newTask;
     }
 
     private void thenExpectIndentationLevel(int expected) {
diff --git a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
similarity index 100%
rename from tests-sync/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
rename to tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java
diff --git a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
similarity index 100%
rename from tests-sync/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
rename to tests/src/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java
diff --git a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
similarity index 94%
rename from tests-sync/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
rename to tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
index 9bf6521d6..8d642534b 100644
--- a/tests-sync/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java
@@ -8,6 +8,7 @@ import com.google.api.services.tasks.model.TaskLists;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Metadata;
+import com.todoroo.astrid.data.StoreObject;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.test.DatabaseTestCase;
 
@@ -19,6 +20,7 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
     @Autowired private GtasksTaskListUpdater gtasksTaskListUpdater;
 
     private Task A, B, C, D, E, F;
+    private StoreObject list;
 
     /* Starting State:
      *
@@ -219,8 +221,8 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
 
     /** moveTo = null => move to end */
     private void whenTriggerMove(Task target, Task moveTo) {
-        gtasksTaskListUpdater.moveTo(target.getId(), moveTo == null ? -1 : moveTo.getId());
-        gtasksTaskListUpdater.debugPrint("1");
+        gtasksTaskListUpdater.moveTo(null, list, target.getId(), moveTo == null ? -1 : moveTo.getId());
+        gtasksTaskListUpdater.debugPrint(null, list);
     }
 
     private void thenExpectMetadataOrderAndIndent(Task task, long order, int indent) {
@@ -236,12 +238,14 @@ public class GtasksTaskMovingTest extends DatabaseTestCase {
 
         TaskLists lists = new TaskLists();
         List<TaskList> items = new ArrayList<TaskList>();
-        TaskList list = new TaskList();
-        list.setId("1");
-        list.setTitle("Tim's Tasks");
-        items.add(list);
+        TaskList taskList = new TaskList();
+        taskList.setId("1");
+        taskList.setTitle("Tim's Tasks");
+        items.add(taskList);
         lists.setItems(items);
         gtasksListService.updateLists(lists);
+
+        list = gtasksListService.getLists()[0];
     }
 
     /**
diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java b/tests/src/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java
new file mode 100644
index 000000000..4887aa3c8
--- /dev/null
+++ b/tests/src/com/todoroo/astrid/gtasks/GtasksTestPreferenceService.java
@@ -0,0 +1,25 @@
+package com.todoroo.astrid.gtasks;
+
+public class GtasksTestPreferenceService extends GtasksPreferenceService {
+
+    private boolean loggedIn = false;
+    private long syncDate = 0;
+
+    public void setLoggedIn(boolean loggedIn) {
+        this.loggedIn = loggedIn;
+    }
+
+    @Override
+    public boolean isLoggedIn() {
+        return loggedIn;
+    }
+
+    public void setSyncDate(long date) {
+        syncDate = date;
+    }
+
+    @Override
+    public long getLastSyncDate() {
+        return syncDate;
+    }
+}