diff --git a/app/app/pods/profile/controller.js b/app/app/pods/profile/controller.js
index 90321893..befce44f 100644
--- a/app/app/pods/profile/controller.js
+++ b/app/app/pods/profile/controller.js
@@ -3,6 +3,7 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
     userService: Ember.inject.service('user'),
     password: { password: "", confirmation: ""},
+    session: Ember.inject.service(),
 
     actions: {
         save: function() {
diff --git a/app/tests/acceptance/documents-space-test.js b/app/tests/acceptance/documents-space-test.js
index 1032b690..4a28d3a8 100644
--- a/app/tests/acceptance/documents-space-test.js
+++ b/app/tests/acceptance/documents-space-test.js
@@ -74,6 +74,7 @@ test('changing space name', function(assert) {
     server.createList('permission', 4);
     authenticateUser();
     visit('/s/VzMuyEw_3WqiafcG/my-project/settings');
+    return pauseTest();
 
     fillIn('#folderName', 'Test Space');
     click('.button-blue');
diff --git a/app/tests/acceptance/user-profile-test.js b/app/tests/acceptance/user-profile-test.js
index 944ddf55..b4a72cc5 100644
--- a/app/tests/acceptance/user-profile-test.js
+++ b/app/tests/acceptance/user-profile-test.js
@@ -23,7 +23,7 @@ test('changing user details and email ', function(assert) {
 
     andThen(function() {
         assert.equal(currentURL(), '/profile');
-        assert.equal(find('.name').text().trim(), 'Lennex Zinyando', 'Profile name displayed');
+        assert.equal(find('.content .name').text().trim(), 'Lennex Zinyando', 'Profile name displayed');
         assert.equal(find('#firstname').val(), 'Lennex', 'Firstaname input displays correct value');
         assert.equal(find('#lastname').val(), 'Zinyando', 'Lastname input displays correct value');
         assert.equal(find('#email').val(), 'brizdigital@gmail.com', 'Email input displays correct value');
diff --git a/app/tests/acceptance/user-settings-test.js b/app/tests/acceptance/user-settings-test.js
index acac7376..f4fa0d95 100644
--- a/app/tests/acceptance/user-settings-test.js
+++ b/app/tests/acceptance/user-settings-test.js
@@ -95,6 +95,5 @@ function checkForCommonAsserts() {
     findWithAssert('.sidebar-menu');
     findWithAssert('#user-button');
     findWithAssert('#accounts-button');
-    findWithAssert('a:contains(Dashboard)');
-    findWithAssert('a:contains(Settings)');
+    findWithAssert('.info .title');
 }
diff --git a/app/tests/helpers/start-app.js b/app/tests/helpers/start-app.js
index f3ec7b64..1d1582e3 100644
--- a/app/tests/helpers/start-app.js
+++ b/app/tests/helpers/start-app.js
@@ -1,7 +1,6 @@
 import Ember from 'ember';
 import Application from '../../app';
 import config from '../../config/environment';
-import './stub-session';
 import './stub-audit';
 import './user-login';
 import './wait-to-appear';
diff --git a/app/tests/helpers/stub-session.js b/app/tests/helpers/stub-session.js
deleted file mode 100644
index 933616ae..00000000
--- a/app/tests/helpers/stub-session.js
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// This software (Documize Community Edition) is licensed under
-// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
-//
-// You can operate outside the AGPL restrictions by purchasing
-// Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>.
-//
-// https://documize.com
-
-import Ember from 'ember';
-import encodingUtil from 'documize/utils/encoding';
-import netUtil from 'documize/utils/net';
-import models from 'documize/utils/model';
-import SimpleAuthSession from 'ember-simple-auth/services/session';
-
-const {
-    inject: { service },
-    computed: { oneWay, or },
-    computed
-} = Ember;
-
-const Session = SimpleAuthSession.extend({
-    ajax: service(),
-    appMeta: service(),
-
-    authenticated: oneWay('isAuthenticated'),
-    isAdmin: oneWay('user.admin'),
-    isEditor: or('user.admin', 'user.editor'),
-
-    user: computed('session.content.authenticated.user', function(){
-        let user = this.get('session.content.authenticated.user');
-        if (user) {
-            return models.UserModel.create(user);
-        }
-    }),
-
-    folderPermissions: null,
-    currentFolder: null,
-
-    clearSession: function() {
-        // TODO: clear session properly with ESA
-        // localStorage.clear();
-    },
-
-    storeSessionItem: function() {
-        // localStorage[key] = data;
-    },
-
-    getSessionItem: function() {
-        // return localStorage[key];
-    },
-
-    clearSessionItem: function() {
-        // delete localStorage[key];
-    }
-});
-
-
-export default Ember.Test.registerAsyncHelper('stubSession', function(app, test, attrs={}) {
-    test.register('service:session', Session.extend(attrs));
-});