diff --git a/e2e/playwright/list-views/exclude.tests.json b/e2e/playwright/list-views/exclude.tests.json
index ecd0f2f4e..b947e1d69 100644
--- a/e2e/playwright/list-views/exclude.tests.json
+++ b/e2e/playwright/list-views/exclude.tests.json
@@ -1,3 +1,3 @@
 {
-  "XAT-4525": "https://alfresco.atlassian.net/browse/AAE-7517"
+  "XAT-4525": "https://hyland.atlassian.net/browse/ACS-9741"
 }
diff --git a/e2e/playwright/search/exclude.tests.json b/e2e/playwright/search/exclude.tests.json
index 6b20c23ce..07b2a6253 100644
--- a/e2e/playwright/search/exclude.tests.json
+++ b/e2e/playwright/search/exclude.tests.json
@@ -1,7 +1,5 @@
 {
   "XAT-5601": "https://hyland.atlassian.net/browse/ACS-6928",
   "XAT-5600": "https://hyland.atlassian.net/browse/ACS-6928",
-  "XAT-17697": "https://hyland.atlassian.net/browse/ACS-7464",
-  "XAT-5580": "https://hyland.atlassian.net/browse/ACS-7682",
-  "XAT-5571": "https://hyland.atlassian.net/browse/ACS-9192"
+  "XAT-17697": "https://hyland.atlassian.net/browse/ACS-7464"
 }
diff --git a/e2e/playwright/viewer/exclude.tests.json b/e2e/playwright/viewer/exclude.tests.json
index f8116537c..0967ef424 100644
--- a/e2e/playwright/viewer/exclude.tests.json
+++ b/e2e/playwright/viewer/exclude.tests.json
@@ -1,7 +1 @@
-{
-    "XAT-17181": "https://hyland.atlassian.net/browse/ACS-8865",
-    "XAT-17182": "https://hyland.atlassian.net/browse/ACS-8865",
-    "XAT-17184": "https://hyland.atlassian.net/browse/ACS-8865",
-    "XAT-17185": "https://hyland.atlassian.net/browse/ACS-8865",
-    "XAT-5470": "https://hyland.atlassian.net/browse/ACS-9580"
-}
+{}
diff --git a/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts
index 03128e826..3dbe2a516 100644
--- a/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts
@@ -252,7 +252,7 @@ export class DataTableComponent extends BaseComponent {
         const row = this.getRowByName(name);
         await row.hover();
         await row.locator(this.uncheckedCheckbox).click();
-        await row.locator(this.checkedCheckbox).waitFor({ state: 'attached' });
+        await row.locator(this.checkedCheckbox).waitFor({ state: 'visible', timeout: timeouts.large });
       }
     }
   }
diff --git a/projects/aca-playwright-shared/src/page-objects/components/viewer.component.ts b/projects/aca-playwright-shared/src/page-objects/components/viewer.component.ts
index 2f3cff404..870b062f9 100644
--- a/projects/aca-playwright-shared/src/page-objects/components/viewer.component.ts
+++ b/projects/aca-playwright-shared/src/page-objects/components/viewer.component.ts
@@ -30,7 +30,7 @@ import { timeouts } from '../../utils';
 export class ViewerComponent extends BaseComponent {
   private static rootElement = 'adf-viewer';
 
-  public viewerLocator = this.getChild('.adf-viewer-render-layout-content');
+  public viewerLocator = this.getChild('adf-viewer-render');
   public closeButtonLocator = this.getChild('.adf-viewer-close-button');
   public fileTitleButtonLocator = this.getChild('.adf-viewer__file-title');
   public pdfViewerContentPages = this.getChild('.adf-pdf-viewer__content .page');