diff --git a/testing/schrodingertest/pom.xml b/testing/schrodingertest/pom.xml
index 08f0099570f..793b5c61889 100644
--- a/testing/schrodingertest/pom.xml
+++ b/testing/schrodingertest/pom.xml
@@ -133,6 +133,12 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>task-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java
index 6b572c93a3b..46132e1e1de 100644
--- a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java
+++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java
@@ -147,7 +147,6 @@ public void afterClass() {
         aboutPage
                 .clickSwitchToFactoryDefaults()
                 .clickYes();
-
     }
 
     protected void importObject(File source, Boolean overrideExistingObject) {
diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/PreviewPageTest.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/PreviewPageTest.java
index e20ce00ec44..62e476067df 100644
--- a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/PreviewPageTest.java
+++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/PreviewPageTest.java
@@ -26,8 +26,6 @@
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.PasswordType;
 
-import org.springframework.test.annotation.DirtiesContext;
-import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
 import com.evolveum.midpoint.schrodinger.component.prism.show.PreviewChangesTab;
@@ -59,23 +57,19 @@ public void test001createUser() {
 
         PreviewPage previewPage = null;
 
-        PrismForm<AssignmentHolderBasicTab<UserPage>> f = user.selectTabBasic()
+        PreviewPage f = user.selectTabBasic()
                 .form()
                     .addAttributeValue("name", "jack")
                     .addAttributeValue(UserType.F_GIVEN_NAME, "Jack")
-                    .setPasswordFieldsValues(PasswordType.F_VALUE,"asd123");
-
-        Selenide.screenshot("after password");
-                previewPage = f.and()
+                    .setPasswordFieldsValues(PasswordType.F_VALUE,"asd123")
+                    .and()
                 .and()
                 .clickPreview();
         //@formatter:on
 
-        Selenide.screenshot("preview");
         ScenePanel<PreviewChangesTab> primaryDeltaScene = previewPage.selectPanelByName("jack").primaryDeltas();
         assertTrue(primaryDeltaScene.isExpanded(), "Primary deltas should be expanded");
 
-        Selenide.screenshot("deltas");
         List<ScenePanel> deltas = primaryDeltaScene.objectDeltas();
         assertEquals(3, deltas.size(), "Unexpected number of primary deltas");
 
@@ -106,8 +100,6 @@ public void test002modifyUser() {
                 .clickPreviewChanges();
         //@formatter:on
 
-        Selenide.screenshot("modfifyUser, preview change");
-
         ScenePanel<PreviewChangesTab> primaryDeltaScene = previewPage.selectPanelByName("jack").primaryDeltas();
         assertTrue(primaryDeltaScene.isExpanded(), "Primary deltas should be expanded");
 
@@ -139,7 +131,7 @@ public void test003assignRolePreview() {
                                 .search()
                                     .byName()
                                         .inputValue(ROLE_USER_PREVIEW_NAME)
-                                    .and()
+                                    .updateSearch()
                                 .and()
                             .selectCheckboxByName(ROLE_USER_PREVIEW_NAME)
                         .and()
diff --git a/testing/schrodingertest/testng-integration.xml b/testing/schrodingertest/testng-integration.xml
index 8783635402e..28e4c92f5b9 100644
--- a/testing/schrodingertest/testng-integration.xml
+++ b/testing/schrodingertest/testng-integration.xml
@@ -55,6 +55,7 @@
     <test name="Schrodinger.UserTest" preserve-order="true" parallel="false" verbose="3" enabled="true">
         <classes>
             <class name="com.evolveum.midpoint.testing.schrodinger.UserTest"/>
+            <class name="com.evolveum.midpoint.testing.schrodinger.page.PreviewPageTest"/>
         </classes>
     </test>
     <test name="Schrodinger.UsersTest" preserve-order="true" parallel="false" verbose="3" enabled="true">
diff --git a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/BasicPage.java b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/BasicPage.java
index 76152da90e5..a737f106e94 100644
--- a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/BasicPage.java
+++ b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/BasicPage.java
@@ -371,7 +371,7 @@ public SelenideElement getMenuItemElement(String topLevelMenuKey, String mainMen
             return mainMenu;
         }
         SelenideElement menuItem = mainMenu.$(Schrodinger.byDataResourceKey(menuItemKey));
-        menuItem.waitUntil(Condition.visible, MidPoint.TIMEOUT_MEDIUM_6_S);
+        menuItem.waitUntil(Condition.visible, MidPoint.TIMEOUT_DEFAULT_2_S);
 
         return menuItem;
     }
@@ -401,7 +401,7 @@ private SelenideElement getMainMenuItemElement(String topLevelMenuKey, String ma
             topLevelMenuChevron.shouldHave(Condition.cssClass("fa-chevron-down")).waitUntil(Condition.cssClass("fa-chevron-down"), MidPoint.TIMEOUT_DEFAULT_2_S);
         }
 
-        SelenideElement mainMenu = topLevelMenu.$(Schrodinger.byDataResourceKey(mainMenuKey), index);
+        SelenideElement mainMenu = topLevelMenu.$(Schrodinger.byDataResourceKey("span", mainMenuKey), index);
         mainMenu.shouldBe(Condition.visible);
 
         SelenideElement mainMenuLi = mainMenu.parent().parent();