diff --git a/e2e/components/data-table/data-table.ts b/e2e/components/data-table/data-table.ts
index 85919770f..5ed9adee3 100644
--- a/e2e/components/data-table/data-table.ts
+++ b/e2e/components/data-table/data-table.ts
@@ -106,7 +106,7 @@ export class DataTable extends Component {
     }
 
     getRowByName(name: string): ElementFinder {
-        return this.body.element(by.css(`adf-datatable-cell [title="${name}"]`));
+        return this.body.element(by.cssContainingText(`.adf-data-table-cell`, name));
     }
 
     countRows(): promise.Promise<number> {
@@ -114,7 +114,7 @@ export class DataTable extends Component {
     }
 
     // Navigation/selection methods
-    doubleClickOnItemName(name: string): promise.Promise<void> {
+    doubleClickOnItemName(name: string): promise.Promise<any> {
         const dblClick = browser.actions()
             .mouseMove(this.getRowByName(name))
             .click()
@@ -123,7 +123,7 @@ export class DataTable extends Component {
         return dblClick.perform();
     }
 
-    clickOnItemName(name: string): promise.Promise<void> {
+    clickOnItemName(name: string): promise.Promise<any> {
         return this.getRowByName(name).click();
     }
 
diff --git a/e2e/components/dialog/create-edit-folder-dialog.ts b/e2e/components/dialog/create-edit-folder-dialog.ts
index e3ff2f637..dbb1aec84 100644
--- a/e2e/components/dialog/create-edit-folder-dialog.ts
+++ b/e2e/components/dialog/create-edit-folder-dialog.ts
@@ -24,8 +24,8 @@ export class CreateOrEditFolderDialog extends Component {
         root: 'adf-folder-dialog',
 
         title: '.mat-dialog-title',
-        nameInput: 'input',
-        descriptionTextArea: 'textarea',
+        nameInput: '.mat-input-element[placeholder="Name" i]',
+        descriptionTextArea: '.mat-input-element[placeholder="Description" i]',
         button: '.mat-dialog-actions button',
         validationMessage: '.mat-hint span'
     };
diff --git a/e2e/components/sidenav/sidenav.ts b/e2e/components/sidenav/sidenav.ts
index 53590c9ca..9d31bef48 100644
--- a/e2e/components/sidenav/sidenav.ts
+++ b/e2e/components/sidenav/sidenav.ts
@@ -54,7 +54,7 @@ export class Sidenav extends Component {
         return this.component.element(by.cssContainingText(Sidenav.selectors.link, label));
     }
 
-    navigateToLinkByLabel(label: string): promise.Promise<void> {
+    navigateToLinkByLabel(label: string): promise.Promise<any> {
         return this.getLinkByLabel(label).click();
     }
 }
diff --git a/e2e/pages/page.ts b/e2e/pages/page.ts
index 7b30f62b8..0867bfa45 100644
--- a/e2e/pages/page.ts
+++ b/e2e/pages/page.ts
@@ -19,7 +19,7 @@ import { browser, element, by, ElementFinder, promise, ExpectedConditions as EC
 import { BROWSER_WAIT_TIMEOUT } from './../configs';
 
 export abstract class Page {
-    private static USE_HASH_STRATEGY = true;
+    private static USE_HASH_STRATEGY = false;
 
     private locators = {
         app: by.css('app-root'),
diff --git a/e2e/suites/list-views/recent-files.test.ts b/e2e/suites/list-views/recent-files.test.ts
index 27b43f7ff..361c666a3 100644
--- a/e2e/suites/list-views/recent-files.test.ts
+++ b/e2e/suites/list-views/recent-files.test.ts
@@ -63,7 +63,7 @@ describe('Recent Files', () => {
             .then(() => dataTable.isEmptyList())
             .then(empty => {
                 if (empty) {
-                    browser.sleep(3000);
+                    browser.sleep(5000);
                     recentFilesPage.refresh();
                 }
             })
diff --git a/protractor.conf.js b/protractor.conf.js
index e223a8b37..ba46ec01b 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -27,7 +27,8 @@ exports.config = {
         chromeOptions: {
             prefs: {
                 'credentials_enable_service': false
-            }
+            },
+            args: [ '--incognito', '--headless' ]
         }
     },