diff --git a/lib/testing/src/lib/core/pages/form/formFields.ts b/lib/testing/src/lib/core/pages/form/formFields.ts
index 119ca17628..fc31ad53df 100644
--- a/lib/testing/src/lib/core/pages/form/formFields.ts
+++ b/lib/testing/src/lib/core/pages/form/formFields.ts
@@ -38,8 +38,8 @@ export class FormFields {
         await BrowserActions.clearSendKeys(fieldElement, value);
     }
 
-    async clickField(locator, field): Promise<void> {
-        const fieldElement = element(locator(field));
+    async clickField(locator, field, fieldtext?): Promise<void> {
+        const fieldElement = fieldtext ? element(locator(field, fieldtext)) : element(locator(field));
         await BrowserActions.click(fieldElement);
     }
 
diff --git a/lib/testing/src/lib/core/pages/viewerPage.ts b/lib/testing/src/lib/core/pages/viewerPage.ts
index 2df678d2fb..1a92a14403 100644
--- a/lib/testing/src/lib/core/pages/viewerPage.ts
+++ b/lib/testing/src/lib/core/pages/viewerPage.ts
@@ -233,6 +233,7 @@ export class ViewerPage {
     }
 
     async checkFileNameIsDisplayed(file): Promise<void> {
+        await BrowserVisibility.waitUntilElementIsVisible(this.fileName);
         await expect(await BrowserActions.getText(this.fileName)).toEqual(file);
     }
 
diff --git a/lib/testing/src/lib/core/public-api.ts b/lib/testing/src/lib/core/public-api.ts
index 33bfe4594a..c4ebe673dc 100644
--- a/lib/testing/src/lib/core/public-api.ts
+++ b/lib/testing/src/lib/core/public-api.ts
@@ -18,5 +18,5 @@
 export * from './actions/public-api';
 export * from './pages/public-api';
 export * from './models/public-api';
-
+export * from './dialog/public-api';
 export * from './utils/public-api';