diff --git a/test/mocha/lib/factory.js b/test/mocha/lib/factory.js
index cdaeced09..42efc76e3 100644
--- a/test/mocha/lib/factory.js
+++ b/test/mocha/lib/factory.js
@@ -28,7 +28,12 @@ export default class Factory {
   }
 
   static globalHttpManager() {
-    if(_globalHttpManager == null) { _globalHttpManager = new SFHttpManager(_globalStorageManager); }
+    if(_globalHttpManager == null) {
+      _globalHttpManager = new SFHttpManager();
+      _globalHttpManager.setJWTRequestHandler(async () => {
+        return this.globalStorageManager().getItem("jwt");;
+      })
+    }
     return _globalHttpManager;
   }
 
diff --git a/test/mocha/models.test.js b/test/mocha/models.test.js
index 50645c3a4..825925d00 100644
--- a/test/mocha/models.test.js
+++ b/test/mocha/models.test.js
@@ -46,7 +46,7 @@ describe("notes and tags", () => {
     let noteParams = getNoteParams();
     modelManager.mapResponseItemsToLocalModels([noteParams]);
     let note = modelManager.allItemsMatchingTypes(["Note"])[0];
-    expect(note).to.be.an.instanceOf(Note);
+    expect(note).to.be.an.instanceOf(SNNote);
   });
 
   it('creates two-way relationship between note and tag', () => {
@@ -376,6 +376,7 @@ describe("syncing", () => {
   syncManager.setKeyRequestHandler(async () => {
     return {
       keys: await authManager.keys(),
+      auth_params: await authManager.getAuthParams(),
       offline: false
     };
   })
@@ -389,7 +390,7 @@ describe("syncing", () => {
   }
 
   it('syncing a note many times does not cause duplication', async () => {
-    modelManager.resetLocalMemory();
+    modelManager.handleSignout();
     let pair = createRelatedNoteTagPair();
     let noteParams = pair[0];
     let tagParams = pair[1];
@@ -424,7 +425,7 @@ describe("syncing", () => {
       };
     })
 
-    modelManager.resetLocalMemory();
+    modelManager.handleSignout();
     let pair = createRelatedNoteTagPair();
     let noteParams = pair[0];
     let tagParams = pair[1];
@@ -445,6 +446,7 @@ describe("syncing", () => {
     syncManager.setKeyRequestHandler(async () => {
       return {
         keys: await authManager.keys(),
+        auth_params: await authManager.getAuthParams(),
         offline: false
       };
     })
@@ -471,7 +473,7 @@ describe("syncing", () => {
   })
 
   it('duplicating a tag should maintian its relationships', async () => {
-    modelManager.resetLocalMemory();
+    modelManager.handleSignout();
     let pair = createRelatedNoteTagPair();
     let noteParams = pair[0];
     let tagParams = pair[1];
diff --git a/testing-server.js b/testing-server.js
index 25d8a1a0a..8ceee5329 100644
--- a/testing-server.js
+++ b/testing-server.js
@@ -2,6 +2,7 @@
 
 var connect = require('connect');
 var serveStatic = require('serve-static');
-connect().use(serveStatic(__dirname)).listen(8081, function(){
-    console.log('Server running on 8081...');
+var port = 7000;
+connect().use(serveStatic(__dirname)).listen(port, function(){
+    console.log(`Server running on ${port}...`);
 });