diff --git a/test/api/score.coffee b/test/api/score.coffee
new file mode 100644
index 0000000000..a3b1b41826
--- /dev/null
+++ b/test/api/score.coffee
@@ -0,0 +1,114 @@
+'use strict'
+
+require("../../website/src/server")
+
+describe "Score", ->
+  before (done) ->
+    registerNewUser done, true
+
+  context "Todos that did not previously exist", ->
+    it "creates a completed a todo when using up url", (done) ->
+      request.post(baseURL + "/user/tasks/withUp/up").send(
+        type: "todo"
+        text: "withUp"
+      ).end (res) ->
+        expectCode res, 200
+        request.get(baseURL + "/user/tasks/withUp").end (res) ->
+          upTodo = res.body
+          expect(upTodo.completed).to.equal true
+        done()
+
+    it "creates an uncompleted todo when using down url", (done) ->
+      request.post(baseURL + "/user/tasks/withDown/down").send(
+        type: "todo"
+        text: "withDown"
+      ).end (res) ->
+        expectCode res, 200
+        request.get(baseURL + "/user/tasks/withDown").end (res) ->
+          downTodo = res.body
+          expect(downTodo.completed).to.equal false
+          done()
+
+    it "creates a completed a todo overriding the complete parameter when using up url", (done) ->
+      request.post(baseURL + "/user/tasks/withUpWithComplete/up").send(
+        type: "todo"
+        text: "withUpWithComplete"
+        completed: false
+      ).end (res) ->
+        expectCode res, 200
+        request.get(baseURL + "/user/tasks/withUpWithComplete").end (res) ->
+          upTodo = res.body
+          expect(upTodo.completed).to.equal true
+          done()
+
+    it "Creates an uncompleted todo overriding the completed parameter when using down url", (done) ->
+      request.post(baseURL + "/user/tasks/withDownWithUncomplete/down").send(
+        type: "todo"
+        text: "withDownWithUncomplete"
+        completed: true
+      ).end (res) ->
+        expectCode res, 200
+        request.get(baseURL + "/user/tasks/withDownWithUncomplete").end (res) ->
+          downTodo = res.body
+          expect(downTodo.completed).to.equal false
+          done()
+
+  context "Todo that already exists", ->
+    it "It completes a todo when using up url", (done) ->
+      request.post(baseURL + "/user/tasks").send(
+        type: "todo"
+        text: "Sample Todo"
+      ).end (res) ->
+        expectCode res, 200
+        unCompletedTodo = res.body
+        expect(unCompletedTodo.completed).to.equal false
+        request.post(baseURL + "/user/tasks/"+unCompletedTodo._id+"/up").end (res) ->
+          expectCode res, 200
+          request.get(baseURL + "/user/tasks/"+unCompletedTodo._id).end (res) ->
+            unCompletedTodo = res.body
+            expect(unCompletedTodo.completed).to.equal true
+            done()
+
+    it "It uncompletes a todo when using down url", (done) ->
+      request.post(baseURL + "/user/tasks").send(
+        type: "todo"
+        text: "Sample Todo"
+        completed: true
+      ).end (res) ->
+        expectCode res, 200
+        completedTodo = res.body
+        expect(completedTodo.completed).to.equal true
+        request.post(baseURL + "/user/tasks/"+completedTodo._id+"/down").end (res) ->
+          expectCode res, 200
+          request.get(baseURL + "/user/tasks/"+completedTodo._id).end (res) ->
+            completedTodo = res.body
+            expect(completedTodo.completed).to.equal false
+            done()
+
+  it "Creates and scores up a habit when using up url", (done) ->
+    upHabit = undefined
+    request.post(baseURL + "/user/tasks/habitWithUp/up").send(
+      type: "habit"
+      text: "testTitle"
+      completed: true
+    ).end (res) ->
+      expectCode res, 200
+      request.get(baseURL + "/user/tasks/habitWithUp").end (res) ->
+        upHabit = res.body
+        expect(upHabit.value).to.be.at.least(1)
+        expect(upHabit.type).to.equal("habit")
+        done()
+
+  it "Creates and scores down a habit when using down url", (done) ->
+    downHabit = undefined
+    request.post(baseURL + "/user/tasks/habitWithDown/down").send(
+      type: "habit"
+      text: "testTitle"
+      completed: true
+    ).end (res) ->
+      expectCode res, 200
+      request.get(baseURL + "/user/tasks/habitWithDown").end (res) ->
+        downHabit = res.body
+        expect(downHabit.value).to.have.at.most(-1)
+        expect(downHabit.type).to.equal("habit")
+        done()
diff --git a/test/api/todos.coffee b/test/api/todos.coffee
index 9157bc3187..7b57378bf4 100644
--- a/test/api/todos.coffee
+++ b/test/api/todos.coffee
@@ -97,64 +97,6 @@ describe "Todos", ->
           expect(todo.value).to.equal 0
           done()
 
-      it "Creates a completed a todo when using up url", (done) ->
-        upTodo = undefined
-        request.post(baseURL + "/user/tasks/withUp/up").send(
-            type: "todo"
-            text: "withUp"
-            description: "testDesc"
-        ).end (res) ->
-          expectCode res, 200
-          request.get(baseURL + "/user/tasks/withUp")
-          .send().end (res) ->
-            upTodo = res.body
-            expect(upTodo.completed).to.equal true
-            done()
-
-      it "Creates an uncompleted todo when using down url", (done) ->
-        downTodo = undefined
-        request.post(baseURL + "/user/tasks/withDown/down").send(
-            type: "todo"
-            text: "withDown"
-            description: "testDesc"
-        ).end (res) ->
-          expectCode res, 200
-          request.get(baseURL + "/user/tasks/withDown")
-          .send().end (res) ->
-            downTodo = res.body
-            expect(downTodo.completed).to.equal false
-            done()
-
-      it "Creates a completed a todo overriding the complete parameter when using up url", (done) ->
-        upTodo = undefined
-        request.post(baseURL + "/user/tasks/withUpWithComplete/up").send(
-            type: "todo"
-            text: "withUpWithComplete"
-            complete: false
-            description: "testDesc"
-        ).end (res) ->
-          expectCode res, 200
-          request.get(baseURL + "/user/tasks/withUpWithComplete")
-          .send().end (res) ->
-            upTodo = res.body
-            expect(upTodo.completed).to.equal true
-            done()
-
-      it "Creates an uncompleted todo verriding the complete when using down url", (done) ->
-        downTodo = undefined
-        request.post(baseURL + "/user/tasks/withDownWithUncomplete/down").send(
-            type: "todo"
-            text: "withDownWithUncomplete"
-            complete: true
-            description: "testDesc"
-        ).end (res) ->
-          expectCode res, 200
-          request.get(baseURL + "/user/tasks/withDownWithUncomplete")
-          .send().end (res) ->
-            downTodo = res.body
-            expect(downTodo.completed).to.equal false
-            done()
-
       it "Does not create a todo with an id that already exists", (done) ->
         original_todo = {
           type: "todo"
@@ -212,43 +154,6 @@ describe "Todos", ->
           expect(todo.notes).to.equal "Some notes"
           done()
 
-      it "It completes a todo when using up url", (done) ->
-        unCompletedTodo = undefined
-        request.post(baseURL + "/user/tasks").send(
-            type: "todo"
-            text: "Sample Todo"
-        ).end (res) ->
-          expectCode res, 200
-          unCompletedTodo = res.body
-          expect(unCompletedTodo.completed).to.equal false
-          request.post(baseURL + "/user/tasks/"+unCompletedTodo._id+"/up").send(
-          ).end (res) ->
-            expectCode res, 200
-            request.get(baseURL + "/user/tasks/"+unCompletedTodo._id)
-            .send().end (res) ->
-              unCompletedTodo = res.body
-              expect(unCompletedTodo.completed).to.equal true
-              done()
-
-      it "It uncompletes a todo when using down url", (done) ->
-        completedTodo = undefined
-        request.post(baseURL + "/user/tasks").send(
-            type: "todo"
-            text: "Sample Todo"
-            completed: true
-        ).end (res) ->
-          expectCode res, 200
-          completedTodo = res.body
-          expect(completedTodo.completed).to.equal true
-          request.post(baseURL + "/user/tasks/"+completedTodo._id+"/down").send(
-          ).end (res) ->
-            expectCode res, 200
-            request.get(baseURL + "/user/tasks/"+completedTodo._id)
-            .send().end (res) ->
-              completedTodo = res.body
-              expect(completedTodo.completed).to.equal false
-              done()
-
     describe "Deleting todos", ->
       it "Does delete todo", (done) ->
         request.del(baseURL + "/user/tasks/" + todo.id).send(
@@ -278,37 +183,3 @@ describe "Todos", ->
           body = res.body
           expect(body.err).to.equal "Task not found."
           done()
-
-describe "habits", ->
-
-  it "Creates and scores up a habit when using up url", (done) ->
-    upHabit = undefined
-    request.post(baseURL + "/user/tasks/habitWithUp/up").send(
-        type: "habit"
-        text: "testTitle"
-        complete: true
-        description: "testDesc"
-    ).end (res) ->
-      expectCode res, 200
-      request.get(baseURL + "/user/tasks/habitWithUp")
-      .send().end (res) ->
-        upHabit = res.body
-        expect(upHabit.value).to.be.at.least(1);
-        expect(upHabit.type).to.equal("habit");
-        done()
-
-  it "Creates and scores down a habit when using down url", (done) ->
-    downHabit = undefined
-    request.post(baseURL + "/user/tasks/habitWithDown/down").send(
-        type: "habit"
-        text: "testTitle"
-        complete: true
-        description: "testDesc"
-    ).end (res) ->
-      expectCode res, 200
-      request.get(baseURL + "/user/tasks/habitWithDown")
-      .send().end (res) ->
-        downHabit = res.body
-        expect(downHabit.value).to.have.at.most(-1);
-        expect(downHabit.type).to.equal("habit");
-        done()