diff --git a/e2e/playwright/info-drawer/playwright.config.ts b/e2e/playwright/info-drawer/playwright.config.ts
index 2f5d2d83ff..31cb13ef51 100644
--- a/e2e/playwright/info-drawer/playwright.config.ts
+++ b/e2e/playwright/info-drawer/playwright.config.ts
@@ -35,7 +35,7 @@ const config: PlaywrightTestConfig<CustomConfig> = {
       name: 'Info Drawer',
       testDir: './src/tests',
       use: {
-        users: ['hruser', 'admin']
+        users: []
       }
     }
   ]
diff --git a/e2e/playwright/info-drawer/src/tests/general.spec.ts b/e2e/playwright/info-drawer/src/tests/general.spec.ts
index b913c52bdd..9e0a6debd8 100644
--- a/e2e/playwright/info-drawer/src/tests/general.spec.ts
+++ b/e2e/playwright/info-drawer/src/tests/general.spec.ts
@@ -32,6 +32,15 @@ test.describe('Info Drawer - General', () => {
 
   const username = `user1-${Utils.random()}`;
 
+  test.afterAll(async () => {
+    try {
+      await nodesApi.deleteCurrentUserNodes();
+      await trashcanApi.emptyTrashcan();
+    } catch (error) {
+      console.error(`afterAll failed: ${error}`);
+    }
+  });
+
   test.beforeAll(async () => {
     try {
       const apiClientFactory = new ApiClientFactory();
@@ -45,15 +54,6 @@ test.describe('Info Drawer - General', () => {
     }
   });
 
-  test.afterAll(async () => {
-    try {
-      await nodesApi.deleteCurrentUserNodes();
-      await trashcanApi.emptyTrashcan();
-    } catch (error) {
-      console.error(`afterAll failed: ${error}`);
-    }
-  });
-
   test.beforeEach(async ({ loginPage }) => {
     try {
       await loginPage.loginUser({ username, password: username }, { withNavigation: true, waitForLoading: true });
@@ -62,12 +62,6 @@ test.describe('Info Drawer - General', () => {
     }
   });
 
-  test.afterEach(async ({ personalFiles }) => {
-    if (await personalFiles.infoDrawer.infoDrawerPanel.isVisible()) {
-      await personalFiles.acaHeader.viewDetails.click();
-    }
-  });
-
   test('[C268999] Info drawer closes on page refresh', async ({ personalFiles }) => {
     const parentFolder = `parent-${Utils.random()}`;
     const file1 = `file1-${Utils.random()}.txt`;
diff --git a/e2e/playwright/info-drawer/src/tests/library-properties.spec.ts b/e2e/playwright/info-drawer/src/tests/library-properties.spec.ts
index c539677084..94f9f96ed5 100644
--- a/e2e/playwright/info-drawer/src/tests/library-properties.spec.ts
+++ b/e2e/playwright/info-drawer/src/tests/library-properties.spec.ts
@@ -52,12 +52,6 @@ test.describe('Library properties', () => {
     }
   });
 
-  test.afterEach(async ({ myLibrariesPage }) => {
-    if (await myLibrariesPage.libraryDetails.infoDrawerPanel.isVisible()) {
-      await myLibrariesPage.acaHeader.viewDetails.click();
-    }
-  });
-
   test.beforeAll(async () => {
     try {
       const apiClientFactory = new ApiClientFactory();
diff --git a/projects/aca-playwright-shared/src/api/queries-api.ts b/projects/aca-playwright-shared/src/api/queries-api.ts
index b56bb71cbe..0bc00aea82 100755
--- a/projects/aca-playwright-shared/src/api/queries-api.ts
+++ b/projects/aca-playwright-shared/src/api/queries-api.ts
@@ -22,6 +22,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
 
+import { FindQuery } from '@alfresco/js-api';
 import { Utils } from '../utils';
 import { ApiClientFactory } from './api-client-factory';
 
@@ -59,7 +60,7 @@ export class QueriesApi {
 
   private async findSitesTotalItems(searchTerm: string): Promise<number> {
     try {
-      const opts: { term: string; fields: Array<string> } = {
+      const opts: FindQuery = {
         term: searchTerm,
         fields: ['title']
       };