diff --git a/Example/e2e/events/back-from-chats-none-animation.yml b/Example/e2e/events/back-from-chats-none-animation.yml
index 7ff5413a8c..0a54d474ca 100644
--- a/Example/e2e/events/back-from-chats-none-animation.yml
+++ b/Example/e2e/events/back-from-chats-none-animation.yml
@@ -14,15 +14,13 @@ appId: ${APP_ID}
     when:
       platform: iOS
     commands:
-      # TODO: Check if it's possible to tap on type `_UIButtonBarButton`
-      - tapOn:
-         id: "_UIButtonBarButton"
+      - tapOn: "Back"
 
 - runFlow:
     when:
       platform: Android
     commands:
-      - back
+      - tapOn: "Navigate up"
 
 - assertVisible: "9. Chats | transitionStart | closing"
 - assertVisible: "10. Privacy | transitionStart | closing"
diff --git a/Example/e2e/events/back-from-chats-slide-from-bottom-animation.yml b/Example/e2e/events/back-from-chats-slide-from-bottom-animation.yml
index 49284902de..4afe5e6272 100644
--- a/Example/e2e/events/back-from-chats-slide-from-bottom-animation.yml
+++ b/Example/e2e/events/back-from-chats-slide-from-bottom-animation.yml
@@ -11,18 +11,16 @@ appId: ${APP_ID}
     id: "events-go-to-chats"
 
 - runFlow:
-      when:
-          platform: iOS
-      commands:
-          # TODO: Check if it's possible to tap on type `_UIButtonBarButton`
-          - tapOn:
-              id: "_UIButtonBarButton"
+    when:
+      platform: iOS
+    commands:
+      - tapOn: "Back"
 
 - runFlow:
-      when:
-          platform: Android
-      commands:
-          - back
+    when:
+      platform: Android
+    commands:
+      - tapOn: "Navigate up"
 
 - assertVisible: "9. Chats | transitionStart | closing"
 - assertVisible: "10. Privacy | transitionStart | closing"
diff --git a/Example/e2e/events/back-from-chats.yml b/Example/e2e/events/back-from-chats.yml
index 268af0f419..c7ed7057fd 100644
--- a/Example/e2e/events/back-from-chats.yml
+++ b/Example/e2e/events/back-from-chats.yml
@@ -7,18 +7,16 @@ appId: ${APP_ID}
     id: "events-go-to-chats"
 
 - runFlow:
-    when:
-      platform: iOS
-    commands:
-      # TODO: Check if it's possible to tap on type `_UIButtonBarButton`
-      - tapOn:
-          id: "_UIButtonBarButton"
+      when:
+          platform: iOS
+      commands:
+          - tapOn: "Back"
 
 - runFlow:
-    when:
-      platform: Android
-    commands:
-      - back
+      when:
+          platform: Android
+      commands:
+          - tapOn: "Navigate up"
 
 - assertVisible: "9. Chats | transitionStart | closing"
 - assertVisible: "10. Privacy | transitionStart | closing"
diff --git a/Example/e2e/stackPresentation/go-to-main-screen.yml b/Example/e2e/stackPresentation/go-to-main-screen.yml
deleted file mode 100644
index 314cf8f258..0000000000
--- a/Example/e2e/stackPresentation/go-to-main-screen.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-appId: ${APP_ID}
----
-- launchApp
-- assertVisible:
-    id: "root-screen-example-StackPresentation"
-- tapOn:
-    id: "root-screen-example-StackPresentation"
-- assertVisible:
-    id: "stack-presentation-root-scroll-view"
\ No newline at end of file
diff --git a/Example/e2e/stackPresentation/main.yml b/Example/e2e/stackPresentation/main.yml
index 695fcefaf3..bfb22b1b81 100644
--- a/Example/e2e/stackPresentation/main.yml
+++ b/Example/e2e/stackPresentation/main.yml
@@ -1,5 +1,4 @@
 appId: ${APP_ID}
 ---
-- runFlow: go-to-main-screen.yml
 - runFlow: push-form-screen.yml
 - runFlow: open-modal.yml
\ No newline at end of file
diff --git a/Example/e2e/stackPresentation/open-modal.yml b/Example/e2e/stackPresentation/open-modal.yml
index 6d41f9d484..4057f610ce 100644
--- a/Example/e2e/stackPresentation/open-modal.yml
+++ b/Example/e2e/stackPresentation/open-modal.yml
@@ -1,6 +1,5 @@
 appId: ${APP_ID}
 ---
-- launchApp
 - tapOn:
     id: "stack-presentation-modal-button"
 - assertVisible:
diff --git a/Example/e2e/stackPresentation/push-form-screen.yml b/Example/e2e/stackPresentation/push-form-screen.yml
index 805836a57e..1604d8cc48 100644
--- a/Example/e2e/stackPresentation/push-form-screen.yml
+++ b/Example/e2e/stackPresentation/push-form-screen.yml
@@ -1,6 +1,11 @@
 appId: ${APP_ID}
 ---
 - launchApp
+- tapOn:
+      id: "root-screen-example-StackPresentation"
+- assertVisible:
+      id: "stack-presentation-root-scroll-view"
+
 - tapOn:
     id: "stack-presentation-push-button"
 - assertVisible: