diff --git a/.maestro/tests/material_top_bar_example_setup.yaml b/.maestro/setup/material_top_bar_example_setup.yaml
similarity index 100%
rename from .maestro/tests/material_top_bar_example_setup.yaml
rename to .maestro/setup/material_top_bar_example_setup.yaml
diff --git a/.maestro/tests/nested_pagerView_example_setup.yaml b/.maestro/setup/nested_pagerView_example_setup.yaml
similarity index 100%
rename from .maestro/tests/nested_pagerView_example_setup.yaml
rename to .maestro/setup/nested_pagerView_example_setup.yaml
diff --git a/.maestro/tests/on_page_selected_example_setup.yaml b/.maestro/setup/on_page_selected_example_setup.yaml
similarity index 100%
rename from .maestro/tests/on_page_selected_example_setup.yaml
rename to .maestro/setup/on_page_selected_example_setup.yaml
diff --git a/.maestro/tests/pager_basic_example_setup.yaml b/.maestro/setup/pager_basic_example_setup.yaml
similarity index 100%
rename from .maestro/tests/pager_basic_example_setup.yaml
rename to .maestro/setup/pager_basic_example_setup.yaml
diff --git a/.maestro/tests/pager_vertical_basic_example_setup.yaml b/.maestro/setup/pager_vertical_basic_example_setup.yaml
similarity index 100%
rename from .maestro/tests/pager_vertical_basic_example_setup.yaml
rename to .maestro/setup/pager_vertical_basic_example_setup.yaml
diff --git a/.maestro/tests/scrollable_pagerView_example_setup.yaml b/.maestro/setup/scrollable_pagerView_example_setup.yaml
similarity index 100%
rename from .maestro/tests/scrollable_pagerView_example_setup.yaml
rename to .maestro/setup/scrollable_pagerView_example_setup.yaml
diff --git a/.maestro/tests/tab_view_inside_scroll_view_example_setup.yaml b/.maestro/setup/tab_view_inside_scroll_view_example_setup.yaml
similarity index 100%
rename from .maestro/tests/tab_view_inside_scroll_view_example_setup.yaml
rename to .maestro/setup/tab_view_inside_scroll_view_example_setup.yaml
diff --git a/.maestro/tests/material_top_bar_example.yaml b/.maestro/tests/material_top_bar_example.yaml
index 88ed968a..fd2fca7c 100644
--- a/.maestro/tests/material_top_bar_example.yaml
+++ b/.maestro/tests/material_top_bar_example.yaml
@@ -1,6 +1,6 @@
 appId: com.pagerviewexample
 ---
-- runFlow: material_top_bar_example_setup.yaml
+- runFlow: ../setup/material_top_bar_example_setup.yaml
 
 - tapOn:
     id: 'material-top-bar-login-button'
diff --git a/.maestro/tests/nested_pagerView_example.yaml b/.maestro/tests/nested_pagerView_example.yaml
index 5d6c7608..a05e8fe8 100644
--- a/.maestro/tests/nested_pagerView_example.yaml
+++ b/.maestro/tests/nested_pagerView_example.yaml
@@ -1,6 +1,6 @@
 appId: com.pagerviewexample
 ---
-- runFlow: nested_pagerView_example_setup.yaml
+- runFlow: ../setup/nested_pagerView_example_setup.yaml
 
 - swipe:
     from:
diff --git a/.maestro/tests/on_page_selected_example.yaml b/.maestro/tests/on_page_selected_example.yaml
index 27ac66c7..4237a59a 100644
--- a/.maestro/tests/on_page_selected_example.yaml
+++ b/.maestro/tests/on_page_selected_example.yaml
@@ -1,6 +1,6 @@
 appId: com.pagerviewexample
 ---
-- runFlow: on_page_selected_example_setup.yaml
+- runFlow: ../setup/on_page_selected_example_setup.yaml
 
 - tapOn: 'OK'
 
diff --git a/.maestro/tests/pager_basic_example.yaml b/.maestro/tests/pager_basic_example.yaml
index e3217f49..16b4faa0 100644
--- a/.maestro/tests/pager_basic_example.yaml
+++ b/.maestro/tests/pager_basic_example.yaml
@@ -1,6 +1,6 @@
 appId: com.pagerviewexample
 ---
-- runFlow: pager_basic_example_setup.yaml
+- runFlow: ../setup/pager_basic_example_setup.yaml
 - tapOn: 'Scroll Enabled'
 - swipe:
     from:
diff --git a/.maestro/tests/pager_vertical_basic_example.yaml b/.maestro/tests/pager_vertical_basic_example.yaml
index c3811a86..b8907646 100644
--- a/.maestro/tests/pager_vertical_basic_example.yaml
+++ b/.maestro/tests/pager_vertical_basic_example.yaml
@@ -1,6 +1,6 @@
 appId: com.pagerviewexample
 ---
-- runFlow: pager_vertical_basic_example_setup.yaml
+- runFlow: ../setup/pager_vertical_basic_example_setup.yaml
 - tapOn: 'Scroll Enabled'
 - swipe:
     from:
diff --git a/.maestro/tests/pager_basic_example_rtl.yaml b/.maestro/tests/rtl/pager_basic_example_rtl.yaml
similarity index 95%
rename from .maestro/tests/pager_basic_example_rtl.yaml
rename to .maestro/tests/rtl/pager_basic_example_rtl.yaml
index 506dcd97..933adb73 100644
--- a/.maestro/tests/pager_basic_example_rtl.yaml
+++ b/.maestro/tests/rtl/pager_basic_example_rtl.yaml
@@ -7,7 +7,11 @@ appId: com.pagerviewexample
       text: 'PagerView Example'
     timeout: 15000
 
-- tapOn: 'LTR'
+- runFlow:
+    when:
+      visible: 'LTR'
+    commands:
+      - tapOn: 'LTR'
 
 - extendedWaitUntil:
     visible:
diff --git a/.maestro/tests/pager_vertical_basic_example_rtl.yaml b/.maestro/tests/rtl/pager_vertical_basic_example_rtl.yaml
similarity index 95%
rename from .maestro/tests/pager_vertical_basic_example_rtl.yaml
rename to .maestro/tests/rtl/pager_vertical_basic_example_rtl.yaml
index beca5c76..d75a47ee 100644
--- a/.maestro/tests/pager_vertical_basic_example_rtl.yaml
+++ b/.maestro/tests/rtl/pager_vertical_basic_example_rtl.yaml
@@ -7,7 +7,11 @@ appId: com.pagerviewexample
       text: 'PagerView Example'
     timeout: 15000
 
-- tapOn: 'LTR'
+- runFlow:
+    when:
+      visible: 'LTR'
+    commands:
+      - tapOn: 'LTR'
 
 - extendedWaitUntil:
     visible:
diff --git a/.maestro/tests/scrollable_pagerView_example.yaml b/.maestro/tests/scrollable_pagerView_example.yaml
index d7ff6514..4608a8ed 100644
--- a/.maestro/tests/scrollable_pagerView_example.yaml
+++ b/.maestro/tests/scrollable_pagerView_example.yaml
@@ -1,6 +1,6 @@
 appId: com.pagerviewexample
 ---
-- runFlow: scrollable_pagerView_example_setup.yaml
+- runFlow: ../setup/scrollable_pagerView_example_setup.yaml
 
 - swipe:
     start: 90%, 30%
diff --git a/.maestro/tests/tab_view_inside_scroll_view_example.yaml b/.maestro/tests/tab_view_inside_scroll_view_example.yaml
index 332ba227..9a833cdb 100644
--- a/.maestro/tests/tab_view_inside_scroll_view_example.yaml
+++ b/.maestro/tests/tab_view_inside_scroll_view_example.yaml
@@ -1,6 +1,6 @@
 appId: com.pagerviewexample
 ---
-- runFlow: tab_view_inside_scroll_view_example_setup.yaml
+- runFlow: ../setup/tab_view_inside_scroll_view_example_setup.yaml
 
 - swipe:
     start: 90%, 45%
diff --git a/example/index.js b/example/index.js
index 998c2823..9e5d8165 100644
--- a/example/index.js
+++ b/example/index.js
@@ -2,8 +2,10 @@
  * @format
  */
 
-import { AppRegistry } from 'react-native';
+import { AppRegistry, LogBox } from 'react-native';
 import { Navigation } from './src/App';
 import { name as appName } from './app.json';
 
+LogBox.ignoreAllLogs(true);
+
 AppRegistry.registerComponent(appName, () => Navigation);
diff --git a/example/src/tabView/TabViewInsideScrollViewExample.tsx b/example/src/tabView/TabViewInsideScrollViewExample.tsx
index 3e31eed4..1a0ea1f5 100644
--- a/example/src/tabView/TabViewInsideScrollViewExample.tsx
+++ b/example/src/tabView/TabViewInsideScrollViewExample.tsx
@@ -92,7 +92,7 @@ const styles = StyleSheet.create({
   },
   header:{
     width:'100%',
-    height:300,
+    height:200,
     backgroundColor:'purple',
   },
 });
diff --git a/scripts/run-maestro-tests.sh b/scripts/run-maestro-tests.sh
index bdf4b04f..4469c881 100644
--- a/scripts/run-maestro-tests.sh
+++ b/scripts/run-maestro-tests.sh
@@ -8,7 +8,7 @@ trap 'exit 130' INT TERM
 PLATFORM=${1:-}
 APPID="com.pagerviewexample"
 MAX_ATTEMPTS=${MAX_ATTEMPTS:-3}
-RETRY_DELAYS=(30 120)
+RETRY_DELAYS=(5 15)
 DEVICE_ID=${MAESTRO_DEVICE:-${DEVICE_ID:-}}
 SHARD_COUNT=${SHARD_COUNT:-}
 SHARD_INDEX=${SHARD_INDEX:-}
@@ -48,6 +48,7 @@ shopt -s nullglob
 allTestFiles=(
   .maestro/tests/*.yaml
   .maestro/"$PLATFORM"-only/*.yaml
+  .maestro/tests/rtl/*.yaml
 )
 
 if [ ${#allTestFiles[@]} -eq 0 ]; then