diff --git a/src/js/controller/login/login.js b/src/js/controller/login/login.js
index 7103dcb..6db122b 100644
--- a/src/js/controller/login/login.js
+++ b/src/js/controller/login/login.js
@@ -19,7 +19,7 @@ var LoginCtrl = function($scope, $timeout, $location, updateHandler, account, au
 
             // check if account needs to be selected
             if (!info.emailAddress) {
-                goTo('/add-account');
+                $scope.goTo('/add-account');
                 return;
             }
 
@@ -46,7 +46,7 @@ var LoginCtrl = function($scope, $timeout, $location, updateHandler, account, au
                 passphrase: undefined
             }, function(err) {
                 if (err) {
-                    goTo('/login-existing');
+                    $scope.goTo('/login-existing');
                     return;
                 }
 
@@ -55,7 +55,7 @@ var LoginCtrl = function($scope, $timeout, $location, updateHandler, account, au
                         return dialog.error(err);
                     }
 
-                    goTo('/desktop');
+                    $scope.goTo('/desktop');
                 });
             });
         } else if (availableKeys && availableKeys.publicKey && !availableKeys.privateKey) {
@@ -71,24 +71,24 @@ var LoginCtrl = function($scope, $timeout, $location, updateHandler, account, au
 
                 if (privateKeySynced) {
                     // private key is synced, proceed to download
-                    goTo('/login-privatekey-download');
+                    $scope.goTo('/login-privatekey-download');
                     return;
                 }
 
                 // no private key, import key file
-                goTo('/login-new-device');
+                $scope.goTo('/login-new-device');
             });
         } else {
             // no public key available, start onboarding process
-            goTo('/login-initial');
+            $scope.goTo('/login-initial');
         }
     }
 
-    function goTo(location) {
+    $scope.goTo = function(location) {
         return $timeout(function() {
             $location.path(location);
         });
-    }
+    };
 };
 
 module.exports = LoginCtrl;
\ No newline at end of file
diff --git a/test/unit/controller/app/dialog-ctrl-test.js b/test/unit/controller/app/dialog-ctrl-test.js
index 35c0498..347792e 100644
--- a/test/unit/controller/app/dialog-ctrl-test.js
+++ b/test/unit/controller/app/dialog-ctrl-test.js
@@ -27,7 +27,7 @@ describe('Dialog Controller unit test', function() {
         it('should work', function(done) {
             scope.callback = function(confirmed) {
                 expect(confirmed).to.be.true;
-                expect(scope.open).to.be.false;
+                expect(scope.state.dialog.open).to.be.false;
                 done();
             };
             scope.confirm(true);
@@ -38,7 +38,7 @@ describe('Dialog Controller unit test', function() {
         it('should work', function(done) {
             scope.callback = function(confirmed) {
                 expect(confirmed).to.be.false;
-                expect(scope.open).to.be.false;
+                expect(scope.state.dialog.open).to.be.false;
                 done();
             };
             scope.confirm(false);
diff --git a/test/unit/controller/app/navigation-ctrl-test.js b/test/unit/controller/app/navigation-ctrl-test.js
index d4dceaa..18f3d86 100644
--- a/test/unit/controller/app/navigation-ctrl-test.js
+++ b/test/unit/controller/app/navigation-ctrl-test.js
@@ -31,6 +31,7 @@ describe('Navigation Controller unit test', function() {
         notificationStub = sinon.createStubInstance(Notif);
         accountMock = sinon.createStubInstance(Account);
         accountMock.list.returns([account]);
+        accountMock.isLoggedIn.returns(true);
 
         angular.module('navigationtest', ['woServices', 'woEmail', 'woUtil']);
         angular.mock.module('navigationtest');
diff --git a/test/unit/controller/login/login-ctrl-test.js b/test/unit/controller/login/login-ctrl-test.js
index ebf6c93..9efd9fc 100644
--- a/test/unit/controller/login/login-ctrl-test.js
+++ b/test/unit/controller/login/login-ctrl-test.js
@@ -10,7 +10,7 @@ var LoginCtrl = require('../../../../src/js/controller/login/login'),
 
 describe('Login Controller unit test', function() {
     var scope, location, ctrl,
-        emailMock, keychainMock, authMock, accountMock, dialogMock, updateHandlerMock, pathStub,
+        emailMock, keychainMock, authMock, accountMock, dialogMock, updateHandlerMock, goToStub,
         emailAddress = 'fred@foo.com';
 
     beforeEach(function() {
@@ -24,7 +24,6 @@ describe('Login Controller unit test', function() {
         location = {
             path: function() {}
         };
-        pathStub = sinon.stub(location, 'path');
 
         authMock.emailAddress = emailAddress;
     });
@@ -36,6 +35,9 @@ describe('Login Controller unit test', function() {
             scope = $rootScope.$new();
             scope.state = {};
             scope.form = {};
+            scope.goTo = function() {};
+            goToStub = sinon.stub(scope, 'goTo');
+
             ctrl = $controller(LoginCtrl, {
                 $scope: scope,
                 $location: location,
@@ -66,7 +68,7 @@ describe('Login Controller unit test', function() {
 
         createController();
 
-        expect(pathStub.withArgs('/add-account').calledOnce).to.be.true;
+        expect(goToStub.withArgs('/add-account').calledOnce).to.be.true;
     });
 
     it('should fail for auth.init', function() {
@@ -93,7 +95,7 @@ describe('Login Controller unit test', function() {
 
         createController();
 
-        expect(pathStub.withArgs('/login-existing').calledOnce).to.be.true;
+        expect(goToStub.withArgs('/login-existing').calledOnce).to.be.true;
     });
 
     it('should fail for auth.storeCredentials', function() {
@@ -125,7 +127,7 @@ describe('Login Controller unit test', function() {
 
         createController();
 
-        expect(pathStub.withArgs('/desktop').calledOnce).to.be.true;
+        expect(goToStub.withArgs('/desktop').calledOnce).to.be.true;
     });
 
     it('should fail for keychain.requestPrivateKeyDownload', function() {
@@ -153,7 +155,7 @@ describe('Login Controller unit test', function() {
 
         createController();
 
-        expect(pathStub.withArgs('/login-privatekey-download').calledOnce).to.be.true;
+        expect(goToStub.withArgs('/login-privatekey-download').calledOnce).to.be.true;
     });
 
     it('should redirect to /login-new-device', function() {
@@ -167,7 +169,7 @@ describe('Login Controller unit test', function() {
 
         createController();
 
-        expect(pathStub.withArgs('/login-new-device').calledOnce).to.be.true;
+        expect(goToStub.withArgs('/login-new-device').calledOnce).to.be.true;
     });
 
     it('should redirect to /login-initial', function() {
@@ -178,7 +180,7 @@ describe('Login Controller unit test', function() {
 
         createController();
 
-        expect(pathStub.withArgs('/login-initial').calledOnce).to.be.true;
+        expect(goToStub.withArgs('/login-initial').calledOnce).to.be.true;
     });
 
 });
\ No newline at end of file