diff --git a/01-uiautomator/final/UIAutomatorApp/app/src/androidTest/java/net/moudra/uiautomatorapp/AutomatorTest.java b/01-uiautomator/final/UIAutomatorApp/app/src/androidTest/java/net/moudra/uiautomatorapp/AutomatorTest.java
index 0bf64c1..7b1f946 100644
--- a/01-uiautomator/final/UIAutomatorApp/app/src/androidTest/java/net/moudra/uiautomatorapp/AutomatorTest.java
+++ b/01-uiautomator/final/UIAutomatorApp/app/src/androidTest/java/net/moudra/uiautomatorapp/AutomatorTest.java
@@ -41,16 +41,7 @@ public void testCalculator() throws Exception {
 
         appButton.clickAndWaitForNewWindow();
 
-        // Scrollable view with apps
-        UiScrollable appViews = new UiScrollable(new UiSelector().scrollable(true));
-        assertTrue(appViews.exists());
-
-        appViews.setAsHorizontalList();
-
-        // Find calculator application
-        UiObject calculatorApp = appViews.getChildByText(new UiSelector()
-                .className("android.widget.TextView"), "Calculator");
-        assertTrue(calculatorApp.exists());
+        UiObject calculatorApp = uiDevice.findObject(new UiSelector().textContains("Calculator"));
 
         calculatorApp.clickAndWaitForNewWindow();