diff --git a/e2e/suites/navigation/breadcrumb.test.ts b/e2e/suites/navigation/breadcrumb.test.ts
index 9631e9ac2..dd8df3ce0 100755
--- a/e2e/suites/navigation/breadcrumb.test.ts
+++ b/e2e/suites/navigation/breadcrumb.test.ts
@@ -137,7 +137,7 @@ describe('Breadcrumb', () => {
   });
 
   it('[C260967] File Libraries breadcrumb for a folder hierarchy', async () => {
-    await page.clickFileLibrariesAndWait();
+    await page.goToFavoriteLibrariesAndWait();
     await page.dataTable.doubleClickOnRowByName(siteName);
     await page.dataTable.doubleClickOnRowByName(parentFromSite);
     await page.dataTable.doubleClickOnRowByName(subFolder1FromSite);
diff --git a/e2e/suites/navigation/sidebar.test.ts b/e2e/suites/navigation/sidebar.test.ts
index 777897cd0..76a4580a1 100755
--- a/e2e/suites/navigation/sidebar.test.ts
+++ b/e2e/suites/navigation/sidebar.test.ts
@@ -47,31 +47,15 @@ describe('Sidebar', () => {
     expect(await sidenav.isActive(SIDEBAR_LABELS.PERSONAL_FILES)).toBe(true, 'Default active link');
   });
 
-  it('[C217150] File Libraries has correct sub-categories', async () => {
-    await page.clickFileLibraries();
-    expect(await sidenav.isFileLibrariesMenuExpanded()).toBe(true, 'File Libraries not expanded');
-    expect(await sidenav.getLink(SIDEBAR_LABELS.MY_LIBRARIES).isPresent()).toBe(true, 'My Libraries link not present');
-    expect(await sidenav.getLink(SIDEBAR_LABELS.FAVORITE_LIBRARIES).isPresent()).toBe(true, 'Favorite Libraries link not present');
-  });
-
-  it('[C289900] Favorite Libraries is automatically selected on expanding File Libraries', async () => {
-    await sidenav.expandFileLibraries();
-    expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.FAVORITE_LIBRARIES);
-    expect(await sidenav.isActive(SIDEBAR_LABELS.FILE_LIBRARIES)).toBe(true, 'File Libraries is not active');
-    expect(await sidenav.isActive(SIDEBAR_LABELS.FAVORITE_LIBRARIES)).toBe(true, 'Favorite Libraries link not active');
-  });
-
   it('[C289902] navigate to Favorite Libraries', async () => {
     await page.goToFavoriteLibraries();
     expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.FAVORITE_LIBRARIES);
-    expect(await sidenav.isActive(SIDEBAR_LABELS.FILE_LIBRARIES)).toBe(true, 'File Libraries link is not active');
     expect(await sidenav.isActive(SIDEBAR_LABELS.FAVORITE_LIBRARIES)).toBe(true, 'Favorite Libraries link not active');
   });
 
   it('[C289901] navigate to My Libraries', async () => {
     await page.goToMyLibraries();
     expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.MY_LIBRARIES);
-    expect(await sidenav.isActive(SIDEBAR_LABELS.FILE_LIBRARIES)).toBe(true, 'File Libraries link is not active');
     expect(await sidenav.isActive(SIDEBAR_LABELS.MY_LIBRARIES)).toBe(true, 'My Libraries link not active');
   });
 
@@ -145,13 +129,13 @@ describe('Sidebar', () => {
     expect(await sidenav.getLinkTooltip(SIDEBAR_LABELS.TRASH)).toContain('View deleted files in the trash');
   });
 
-  it('[C217152] File Libraries tooltip', async () => {
-    await page.clickFileLibraries();
-    expect(await sidenav.getLinkTooltip(SIDEBAR_LABELS.FILE_LIBRARIES)).toContain('File Libraries');
+  // it('[C217152] File Libraries tooltip', async () => {
+  //   await page.clickFileLibraries();
+  //   expect(await sidenav.getLinkTooltip(SIDEBAR_LABELS.FILE_LIBRARIES)).toContain('File Libraries');
 
-    await header.collapseSideNav();
-    expect(await sidenav.getLinkTooltip(SIDEBAR_LABELS.FILE_LIBRARIES)).toContain('File Libraries');
-  });
+  //   await header.collapseSideNav();
+  //   expect(await sidenav.getLinkTooltip(SIDEBAR_LABELS.FILE_LIBRARIES)).toContain('File Libraries');
+  // });
 
   it('[C289916] My Libraries tooltip', async () => {
     await page.goToMyLibraries();
@@ -211,7 +195,7 @@ describe('Sidebar', () => {
     expect(await header.isSidenavExpanded()).toBe(false, 'Sidebar not collapsed');
   });
 
-  it('[C277224] sidenav returns to the default state when navigating away from the Search Results page', async () => {
+  fit('[C277224] sidenav returns to the default state when navigating away from the Search Results page', async () => {
     await searchInput.clickSearchButton();
     /* cspell:disable-next-line */
     await searchInput.searchFor('qwertyuiop');
diff --git a/e2e/suites/navigation/single-click.test.ts b/e2e/suites/navigation/single-click.test.ts
index dd6b42952..b2969d0c6 100755
--- a/e2e/suites/navigation/single-click.test.ts
+++ b/e2e/suites/navigation/single-click.test.ts
@@ -117,7 +117,7 @@ describe('Single click on item name', () => {
 
   describe('on File Libraries', () => {
     beforeEach(async () => {
-      await page.clickFileLibrariesAndWait();
+      await page.goToFavoriteLibrariesAndWait();
     });
 
     it('[C284901] Hyperlink appears when mouse over a library', async () => {
diff --git a/projects/aca-content/src/lib/components/header-actions/header-actions.component.html b/projects/aca-content/src/lib/components/header-actions/header-actions.component.html
index 9eec2c0a8..62775f6d8 100644
--- a/projects/aca-content/src/lib/components/header-actions/header-actions.component.html
+++ b/projects/aca-content/src/lib/components/header-actions/header-actions.component.html
@@ -22,5 +22,5 @@
   </mat-menu>
 
   <adf-toolbar-divider *ngIf="canShowSearchSeparator()"></adf-toolbar-divider>
-  <aca-search-input class="app-search-input"></aca-search-input>
+  <aca-search-input class="aca-search-input"></aca-search-input>
 </adf-toolbar>
diff --git a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
index 5bc13c3d9..8feacad7b 100644
--- a/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
+++ b/projects/aca-content/src/lib/components/search/search-input/search-input.component.html
@@ -5,7 +5,7 @@
   (menuClosed)="syncInputValues()"
 >
 
-  <button mat-icon-button class="app-search-button" (click)="searchByOption()" [title]="'SEARCH.BUTTON.TOOLTIP' | translate">
+  <button mat-icon-button class="app-search-button" (click)="searchByOption()" [title]="'SEARCH.BUTTON.TOOLTIP' | translate" id="app-search-button">
     <mat-icon [attr.aria-label]="'SEARCH.BUTTON.ARIA-LABEL' | translate">search</mat-icon>
   </button>
   <mat-form-field class="app-input-form-field" [floatLabel]="'never'">
@@ -30,7 +30,7 @@
 
 <div *ngIf="!searchInputService.isSearchRoute()"
   class="app-search-container">
-  <button mat-icon-button class="app-search-button" (click)="navigateToSearch()" [title]="'SEARCH.BUTTON.TOOLTIP' | translate">
+  <button mat-icon-button class="app-search-button" (click)="navigateToSearch()" [title]="'SEARCH.BUTTON.TOOLTIP' | translate" id="app-search-button">
     <mat-icon [attr.aria-label]="'SEARCH.BUTTON.ARIA-LABEL' | translate">search</mat-icon>
   </button>
 </div>
@@ -38,7 +38,7 @@
 <mat-menu #searchOptionsMenu="matMenu" [overlapTrigger]="true" class="app-search-options-menu">
   <div (keydown.tab)="$event.stopPropagation()" (keydown.shift.tab)="$event.stopPropagation()">
     <div cdkTrapFocus>
-      <app-search-input-control
+      <app-search-input-control class="app-search-control" id="app-search-control"
         #searchInputControl
         (click)="$event.stopPropagation()"
         (submit)="onSearchSubmit($event)"
diff --git a/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html b/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html
index d83b01b50..a988857e7 100644
--- a/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html
+++ b/projects/aca-content/src/lib/components/sidenav/components/sidenav-header.component.html
@@ -1,6 +1,6 @@
 <div class="sidenav-header">
   <div class="sidenav-header-title">
-    <div class="sidenav-header-title-logo"
+    <div class="sidenav-header-title-logo" id="adf-sidebar-toggle-start"
       (click)="toggleNavBar.emit()"
       (keypress)="toggleNavBar.emit()">
       <img
diff --git a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.html b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.html
index 9a22692ec..56c23c0a7 100644
--- a/projects/aca-shared/src/lib/components/page-layout/page-layout.component.html
+++ b/projects/aca-shared/src/lib/components/page-layout/page-layout.component.html
@@ -1,5 +1,5 @@
   <div class="aca-content-header">
-      <button *ngIf="(appNavNarMode$ | async) === 'collapsed'"
+      <button *ngIf="(appNavNarMode$ | async) === 'collapsed'" id="adf-sidebar-toggle-start"
         mat-icon-button
         (click)="toggleClick()"
         title="{{'APP.TOOLTIPS.EXPAND_NAVIGATION' | translate}}">
diff --git a/projects/aca-testing-shared/src/components/header/header.ts b/projects/aca-testing-shared/src/components/header/header.ts
index 4ed1a4ec6..e42d562be 100755
--- a/projects/aca-testing-shared/src/components/header/header.ts
+++ b/projects/aca-testing-shared/src/components/header/header.ts
@@ -43,7 +43,7 @@ export class Header extends Component {
   searchInput = new SearchInput();
 
   constructor(ancestor?: string) {
-    super('adf-layout-header', ancestor);
+    super('adf-layout-container', ancestor);
   }
 
   async openMoreMenu(): Promise<void> {
diff --git a/projects/aca-testing-shared/src/pages/browsing-page.ts b/projects/aca-testing-shared/src/pages/browsing-page.ts
index 4d98bf7ef..881104e25 100755
--- a/projects/aca-testing-shared/src/pages/browsing-page.ts
+++ b/projects/aca-testing-shared/src/pages/browsing-page.ts
@@ -47,7 +47,7 @@ export class BrowsingPage extends Page {
   async clickFileLibraries(): Promise<void> {
     await this.sidenav.clickLink(SIDEBAR_LABELS.FILE_LIBRARIES);
   }
-
+6
   async clickFileLibrariesAndWait(): Promise<void> {
     await this.clickFileLibraries();
     await this.dataTable.waitForHeader();
diff --git a/protractor.conf.js b/protractor.conf.js
index e7ef12248..1f2b02d49 100755
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -39,8 +39,8 @@ exports.config = {
     index_search: 25000,
     config: appConfig,
     downloadFolder: downloadFolder,
-    ADMIN_USERNAME: process.env.ADMIN_EMAIL || 'admin',
-    ADMIN_PASSWORD: process.env.ADMIN_PASSWORD || 'admin',
+    ADMIN_USERNAME: process.env.ADMIN_EMAIL || 'admin@alfresco.com',
+    ADMIN_PASSWORD: process.env.ADMIN_PASSWORD || 'adf$2018IloveAngular',
     e2eRootPath: e2eFolder,
     testConfig: {
       appConfig: {
diff --git a/scripts/update-webdriver.sh b/scripts/update-webdriver.sh
index a1ff5e7c6..d1e02b931 100755
--- a/scripts/update-webdriver.sh
+++ b/scripts/update-webdriver.sh
@@ -3,7 +3,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 if [ "$CI" = "true" ]; then
     echo "Updating wedriver-manager with chromedriver: $npm_package_config_chromeDriver."
-    ./node_modules/protractor/bin/webdriver-manager update --gecko=false --versions.chrome=83.0.4103.116
+    ./node_modules/protractor/bin/webdriver-manager update --gecko=false --versions.chrome=110.0.5481.77
 else
     echo "Updating wedriver-manager with latest chromedriver, be sure to use evergreen Chrome."
     ./node_modules/protractor/bin/webdriver-manager update --gecko=false