keycloak-uncached

diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java
index f295c8d..29b7e50 100644
--- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java
+++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java
@@ -92,7 +92,7 @@ public class Navigation {
     }
 
     public void settings() {
-        openPage(settingsLink, "Settings");
+        openPage(settingsLink, "Master");
     }
 
     public void users() {
@@ -112,7 +112,7 @@ public class Navigation {
     }
 
     public void tokens() {
-        openPage(tokensLink, "Settings");
+        openPage(tokensLink, "Master");
     }
 
     public void sessions() {
@@ -120,7 +120,7 @@ public class Navigation {
     }
 
     public void security() {
-        openPage(securityLink, "Settings");
+        openPage(securityLink, "Master");
     }
 
     public void events() {
@@ -128,11 +128,11 @@ public class Navigation {
     }
 
     public void login() {
-        openPage(loginLink, "Settings");
+        openPage(loginLink, "Master");
     }
 
     public void themes() {
-        openPage(themesLink, "Settings");
+        openPage(themesLink, "Master");
     }
 
     public void roleMappings(String username) {

diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java
index 02e7953..09e1214 100644
--- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java
+++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java
@@ -46,7 +46,7 @@ public class PasswordPolicyPage extends AbstractPage {
 	
 	public void removePolicy(PasswordPolicy policy) {
 		int policyInputLocation = findPolicy(policy);
-		allRows.get(policyInputLocation).findElements(By.tagName("i")).get(0).click();
+		allRows.get(policyInputLocation).findElements(By.tagName("button")).get(0).click();
 		primaryButton.click();
 	}