diff --git a/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts b/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts
index 334a99bce..b73ae3612 100644
--- a/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts
+++ b/e2e/ui-tests-app/e2e/suites/button/background/button-background-page.ts
@@ -8,6 +8,8 @@ export class ButtonBackgroundPage extends PageObjectBaseModel {
 
     constructor(_driver: AppiumDriver) {
         super(_driver, ["button", "background"], ElementCacheStrategy.none);
+        this._driver.imageHelper.options.keepOriginalImageSize = false;
+        this._driver.imageHelper.options.toleranceType = ImageOptions.percent;
     }
 
     public viewGroupLocator() {
@@ -47,7 +49,7 @@ export class ButtonBackgroundPage extends PageObjectBaseModel {
     async executeScenario(imageName: string, button: string) {
         const presenter = await this.testElement();
         await this.tapBtn(button);
-        const result = await this._driver.compareElement(presenter, imageName, 0.5, 5, ImageOptions.percent);
+        const result = await this._driver.compareElement(presenter, imageName, 0.01, 5, ImageOptions.percent);
         assert.isTrue(result);
     }
 }
\ No newline at end of file
diff --git a/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
index 36ff92e15..7d291b150 100644
--- a/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/button/background/button-background.e2e-spec.ts
@@ -16,8 +16,6 @@ describe(`${suite}-${spec}-suite`, () => {
         await driver.restartApp();
         backgroundPage = new ButtonBackgroundPage(driver);
         await backgroundPage.initSuite();
-        driver.imageHelper.options.keepOriginalImageSize = false;
-        driver.imageHelper.options.toleranceType = ImageOptions.percent;
     });
 
     after(async function () {
@@ -38,8 +36,8 @@ describe(`${suite}-${spec}-suite`, () => {
 
     it("background_11", async function () {
         const presenter = await backgroundPage.testElement();
-        await driver.compareElement(presenter, "background_11_clean", 0.1, 2);
-        assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+        const result = await driver.compareElement(presenter, "background_11_clean", 0.1, 2);
+        assert.isTrue(result);
     });
 
     it("background_12", async function () {
@@ -49,8 +47,8 @@ describe(`${suite}-${spec}-suite`, () => {
     it("background_13", async function () {
         await backgroundPage.tapResetBtn();
         const presenter = await backgroundPage.testElement();
-        await driver.compareElement(presenter, "background_11_clean");
-        assert.isTrue(driver.imageHelper.hasImageComparisonPassed());
+        const result = await driver.compareElement(presenter, "background_11_clean");
+        assert.isTrue(result);
     });
 
     // Border
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts
index 753dc16a4..a6f3bef80 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-base-page.ts
@@ -1,6 +1,7 @@
 import { AppiumDriver, Point, IRectangle, UIElement, logInfo } from "nativescript-dev-appium";
 import { PageObjectBaseModel } from "../../../page-object-base-model";
 import { ElementCacheStrategy } from "../../../helpers/navigation-helper";
+import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
 
 export class BottomNavigationBasePage extends PageObjectBaseModel {
     private _bottomNavigatioinTabRect: IRectangle;
@@ -9,8 +10,10 @@ export class BottomNavigationBasePage extends PageObjectBaseModel {
 
     constructor(_driver: AppiumDriver, elementCacheStrategy?: ElementCacheStrategy) {
         super(_driver, ["bottom-navigation"], elementCacheStrategy);
-        this._driver.imageHelper.options.waitBeforeCreatingInitialImageCapture = 4000;
+        this._driver.imageHelper.options.waitBeforeCreatingInitialImageCapture = 6000;
         this._driver.imageHelper.options.keepOriginalImageSize = false;
+        this._driver.imageHelper.options.tolerance = 0;
+        this._driver.imageHelper.options.toleranceType = ImageOptions.pixel;
     }
 
     async init(subSuiteName: string) {
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
index 5225a6783..8fb624b54 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation-css-properties.e2e-spec.ts
@@ -1,6 +1,5 @@
 import { nsCapabilities, createDriver, AppiumDriver, Direction } from "nativescript-dev-appium";
 import { BottomNavigationBasePage } from "./bottom-navigation-base-page";
-import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
 import { Platform } from "mobile-devices-controller";
 import { ElementCacheStrategy } from "../../../helpers/navigation-helper";
 import { setImageName } from "../../../helpers/image-helper";
@@ -51,19 +50,19 @@ describe(`${suite}-${spec}-suite`, async function () {
                 await driver.scroll(Direction.down, 400, 200, 300, 200);
             }
             const scenarioBtn = await driver.waitForElement(sample.sample);
-            await scenarioBtn.tap();
+            await scenarioBtn.click();
             imageName = setImageName(suite, spec, imageName);
-            await driver.imageHelper.compareScreen({ imageName: imageName, timeOutSeconds: 5, tolerance: 0, toleranceType: ImageOptions.pixel });
+            await driver.imageHelper.compareScreen({ imageName: imageName });
             const tabTwo = await driver.waitForElement(sample.tab2);
             await tabTwo.click();
-            await driver.imageHelper.compareScreen({ imageName: imageName, timeOutSeconds: 5 });
+            await driver.imageHelper.compareScreen({ imageName: imageName });
 
             const imageComparissonresult = driver.imageHelper.hasImageComparisonPassed();
             assert.isTrue(imageComparissonresult);
 
             if (imageComparissonresult) {
                 const tabOne = await driver.waitForElement(sample.tab1);
-                await tabOne.tap();
+                await tabOne.click();
             }
         });
     }
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts
index 2be9debb9..737d7f5a0 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/bottom-navigation/bottom-navigation.e2e-spec.ts
@@ -25,10 +25,6 @@ describe(`${suite}-${spec}-suite`, async function () {
 
     beforeEach(async function () {
         driver.imageHelper.testName = setImageName(suite, spec, this.currentTest.title);
-        driver.imageHelper.options = {
-            timeOutSeconds: 5,
-            donNotAppendActualSuffixOnIntialImageCapture: true,
-        };
     });
 
     afterEach(async function () {
diff --git a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts
index bc1a0ebf5..30ab43766 100644
--- a/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts
+++ b/e2e/ui-tests-app/e2e/suites/tab-navigation/tab-view/tab-view-base-page.ts
@@ -1,6 +1,7 @@
 import { AppiumDriver } from "nativescript-dev-appium";
 import { PageObjectBaseModel } from "../../../page-object-base-model";
 import { ElementCacheStrategy } from "./../../../helpers/navigation-helper";
+import { ImageOptions } from "nativescript-dev-appium/lib/image-options";
 
 export class TabViewBasePage extends PageObjectBaseModel {
 
@@ -11,7 +12,8 @@ export class TabViewBasePage extends PageObjectBaseModel {
     async init(subSuiteName: string) {
         this._naviagtionLinks.push(subSuiteName);
         await super.initSuite();
-        this._driver.imageHelper.options.keepOriginalImageSize = false;
-        this._driver.imageHelper.options.waitBeforeCreatingInitialImageCapture = 4000;
+        this._driver.imageHelper.options.keepOriginalImageSize = true;
+        this._driver.imageHelper.options.tolerance = 0;
+        this._driver.imageHelper.options.toleranceType = ImageOptions.pixel;
     }
 }
\ No newline at end of file