diff --git a/app/tests/acceptance/anon-access-disabled-test.js b/app/tests/acceptance/anon-access-disabled-test.js
index 837b13a2..5a260c6a 100644
--- a/app/tests/acceptance/anon-access-disabled-test.js
+++ b/app/tests/acceptance/anon-access-disabled-test.js
@@ -6,6 +6,7 @@ moduleForAcceptance('Acceptance | Anon access disabled');
 
 test('visiting / when not authenticated and with { allowAnonymousAccess: false } takes user to login', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
     visit('/');
 
     andThen(function() {
diff --git a/app/tests/acceptance/anon-access-enabled-test.js b/app/tests/acceptance/anon-access-enabled-test.js
index 53fdb2d7..8b0f23c0 100644
--- a/app/tests/acceptance/anon-access-enabled-test.js
+++ b/app/tests/acceptance/anon-access-enabled-test.js
@@ -5,6 +5,7 @@ moduleForAcceptance('Acceptance | Anon access enabled');
 
 test('visiting / when not authenticated and with { allowAnonymousAccess: true } takes user to folder view', function(assert) {
     server.create('meta', { allowAnonymousAccess: true });
+    server.createList('folder', 2);
     visit('/');
 
     andThen(function() {
@@ -16,6 +17,7 @@ test('visiting / when not authenticated and with { allowAnonymousAccess: true }
 
 test('visiting / when authenticated and with { allowAnonymousAccess: true } takes user to dashboard', function(assert) {
     server.create('meta', { allowAnonymousAccess: true });
+    server.createList('folder', 2);
     visit('/');
 
     andThen(function() {
diff --git a/app/tests/acceptance/authentication-test.js b/app/tests/acceptance/authentication-test.js
index 44140250..2a53d7e0 100644
--- a/app/tests/acceptance/authentication-test.js
+++ b/app/tests/acceptance/authentication-test.js
@@ -1,10 +1,11 @@
-import { test, skip } from 'qunit';
+import { test } from 'qunit';
 import moduleForAcceptance from 'documize/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | Authentication');
 
 test('visiting /auth/login and logging in', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
     visit('/auth/login');
 
     fillIn('#authEmail', 'brizdigital@gmail.com');
@@ -12,17 +13,18 @@ test('visiting /auth/login and logging in', function(assert) {
     click('button');
 
     andThen(function() {
-        assert.equal(currentURL(), '/s/VzMuyEw_3WqiafcG/my-project');
+        assert.equal(currentURL(), '/s/VzMuyEw_3WqiafcG/my-project', 'Login successfull');
     });
 });
 
-skip('logging out a user', function(assert) {
+test('logging out a user', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
     userLogin();
 
-    visit('/auth/logout'); // logs a user out
+    visit('/auth/logout');
 
     andThen(function() {
-        assert.equal(currentURL(), '/');
+        assert.equal(currentURL(), '/auth/login', 'Login successfull');
     });
 });
diff --git a/app/tests/acceptance/documents-space-test.js b/app/tests/acceptance/documents-space-test.js
index efe28f2e..0a0b0b4f 100644
--- a/app/tests/acceptance/documents-space-test.js
+++ b/app/tests/acceptance/documents-space-test.js
@@ -1,10 +1,13 @@
 import { test, skip } from 'qunit';
 import moduleForAcceptance from 'documize/tests/helpers/module-for-acceptance';
+import Ember from 'ember';
 
-moduleForAcceptance('Acceptance | documents space');
+moduleForAcceptance('Acceptance | Documents space');
 
 test('Adding a new folder space', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
+    server.createList('permission', 4);
     userLogin();
     visit('/s/VzMuyEw_3WqiafcG/my-project');
 
@@ -15,17 +18,21 @@ test('Adding a new folder space', function(assert) {
     });
 
     click('#add-folder-button');
-    waitToAppear('#new-folder-name');
-    fillIn(".input-control input", 'Test Folder');
-    click('.actions div:contains(add)');
+
+    fillIn('#new-folder-name', 'body', 'Test Folder');
+
+    click('.actions div:contains(Add)', 'body');
+    // return pauseTest();
 
     andThen(function() {
         assert.equal(currentURL(), '/s/V0Vy5Uw_3QeDAMW9/test-folder');
     });
 });
 
-skip('Adding a document to a space', function(assert) {
+test('Adding a document to a space', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
+    server.createList('permission', 4);
     userLogin();
     visit('/s/VzMuyEw_3WqiafcG/my-project');
 
@@ -37,16 +44,20 @@ skip('Adding a document to a space', function(assert) {
     });
 
     click('#start-document-button');
-    waitToAppear('.drop-content');
-    click('.drop-content');
+    click('.actions div:contains(Add)', 'body');
 
     andThen(function() {
-        assert.equal(currentURL(), 's/V0Vy5Uw_3QeDAMW9/test-folder');
+        let numberOfDocuments = find('.documents-list li').length;
+        assert.equal(numberOfDocuments, 3, '3 documents listed');
+        assert.equal(currentURL(), '/s/VzMuyEw_3WqiafcG/my-project');
+        // return pauseTest();
     });
 });
 
 test('visiting space settings page', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
+    server.createList('permission', 4);
     userLogin();
     visit('/s/VzMuyEw_3WqiafcG/my-project');
 
@@ -61,6 +72,8 @@ test('visiting space settings page', function(assert) {
 
 test('changing space name', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
+    server.createList('permission', 4);
     userLogin();
     visit('/s/VzMuyEw_3WqiafcG/my-project/settings');
 
@@ -77,6 +90,8 @@ test('changing space name', function(assert) {
 
 test('sharing a space', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
+    server.createList('permission', 4);
     userLogin();
     visit('/s/VzMuyEw_3WqiafcG/my-project/settings');
 
@@ -94,6 +109,8 @@ test('sharing a space', function(assert) {
 // Test will pass after moving to factories
 test('changing space permissions', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
+    server.createList('permission', 4);
     userLogin();
     andThen(function() {
         let numberOfPublicFolders = find('.folders-list div:first .list a').length;
@@ -119,6 +136,8 @@ test('changing space permissions', function(assert) {
 
 test('deleting a space', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
+    server.createList('permission', 4);
     userLogin();
     visit('/s/VzMuyEw_3WqiafcG/my-project/settings');
 
@@ -132,6 +151,8 @@ test('deleting a space', function(assert) {
 
 test('deleting a document', function(assert) {
     server.create('meta', { allowAnonymousAccess: false });
+    server.createList('folder', 2);
+    server.createList('permission', 4);
     userLogin();
     visit('/s/VzMuyEw_3WqiafcG/my-project');
 
@@ -152,11 +173,11 @@ test('deleting a document', function(assert) {
     click('#delete-documents-button');
 
     waitToAppear('.drop-content');
-    click('.flat-red');
+    click('.actions div:contains(Delete)', 'body');
 
     andThen(function() {
-        let deleteButton = find('#delete-documents-button');
-        assert.equal(deleteButton.length, 1, 'Delete button displayed');
+        let numberOfDocuments = find('.documents-list li');
+        assert.equal(numberOfDocuments.length, 1, '1 documents is displayed');
     });
 });
 
diff --git a/app/tests/acceptance/user-profile-test.js b/app/tests/acceptance/user-profile-test.js
index 24319133..3223627a 100644
--- a/app/tests/acceptance/user-profile-test.js
+++ b/app/tests/acceptance/user-profile-test.js
@@ -4,6 +4,7 @@ import moduleForAcceptance from 'documize/tests/helpers/module-for-acceptance';
 moduleForAcceptance('Acceptance | user profile');
 
 test('visiting /profile', function(assert) {
+    server.createList('folder', 2);
     userLogin();
     visit('/profile');
 
@@ -16,6 +17,7 @@ test('visiting /profile', function(assert) {
 });
 
 test('changing user details and email ', function(assert) {
+    server.createList('folder', 2);
     userLogin();
     visit('/profile');
 
diff --git a/app/tests/acceptance/user-settings-test.js b/app/tests/acceptance/user-settings-test.js
index ab8ad80d..c851b422 100644
--- a/app/tests/acceptance/user-settings-test.js
+++ b/app/tests/acceptance/user-settings-test.js
@@ -80,6 +80,9 @@ test('add a new user', function(assert) {
     fillIn('#newUserEmail', 'test.user@domain.com');
     click('.button-blue');
 
+    // waitToAppear('.user-notification:contains(Added)');
+    // waitToDisappear('.user-notification:contains(Added)');
+
     andThen(function() {
         let numberOfUsers = find('.user-list tr').length;
         assert.equal(numberOfUsers, 4, '3 Users listed');