keycloak-uncached

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java
index 1e98253..23337f0 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java
@@ -62,10 +62,10 @@ public interface TestingResource {
     @POST
     @Path("/remove-user-session")
     @Produces(MediaType.APPLICATION_JSON)
-    Response removeUserSession(@QueryParam("realm") final String name, @QueryParam("session") final String sessionId);
+    Response removeUserSession(@QueryParam("realm") final String realm, @QueryParam("session") final String sessionId);
 
     @POST
     @Path("/remove-expired")
     @Produces(MediaType.APPLICATION_JSON)
-    Response removeExpired(@QueryParam("realm") final String name);
+    Response removeExpired(@QueryParam("realm") final String realm);
 }

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java
index d3122ff..2badf74 100755
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java
@@ -29,8 +29,8 @@ import javax.ws.rs.core.UriBuilder;
  */
 public class AppPage extends AbstractPage {
 
-    public static final String AUTH_SERVER_URL = "http://localhost:8081/auth";
-    public static final String baseUrl = "http://localhost:8081/app";
+    public static final String AUTH_SERVER_URL = "http://localhost:8180/auth";
+    public static final String baseUrl = "http://localhost:8180/auth/realms/master/app";
 
     @FindBy(id = "account")
     private WebElement accountLink;

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupMappersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupMappersTest.java
index d61a517..c1e59bd 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupMappersTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/group/GroupMappersTest.java
@@ -109,6 +109,7 @@ public class GroupMappersTest extends AbstractGroupTest {
     @Test
     @SuppressWarnings("unchecked")
     public void testGroupMappers() throws Exception {
+        events.clear();
         RealmResource realm = adminClient.realms().realm("test");
         {
             UserRepresentation user = realm.users().search("topGroupUser", -1, -1).get(0);

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmBuilder.java
index 157045c..d40a084 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmBuilder.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmBuilder.java
@@ -28,14 +28,20 @@ import java.util.LinkedList;
  */
 public class RealmBuilder {
 
-    private RealmRepresentation rep = new RealmRepresentation();
+    private final RealmRepresentation rep;
 
     public static RealmBuilder create() {
-        return new RealmBuilder();
+        RealmRepresentation rep = new RealmRepresentation();
+        rep.setEnabled(Boolean.TRUE);
+        return new RealmBuilder(rep);
     }
 
-    private RealmBuilder() {
-        rep.setEnabled(true);
+    public static RealmBuilder edit(RealmRepresentation rep) {
+        return new RealmBuilder(rep);
+    }
+
+    private RealmBuilder(RealmRepresentation rep) {
+        this.rep = rep;
     }
 
     public RealmBuilder name(String name) {

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserBuilder.java
index 0d07371..ae427e1 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserBuilder.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserBuilder.java
@@ -29,14 +29,20 @@ import java.util.List;
  */
 public class UserBuilder {
 
-    private UserRepresentation rep = new UserRepresentation();
+    private final UserRepresentation rep;
 
     public static UserBuilder create() {
-        return new UserBuilder();
+        UserRepresentation rep = new UserRepresentation();
+        rep.setEnabled(Boolean.TRUE);
+        return new UserBuilder(rep);
     }
 
-    private UserBuilder() {
-        rep.setEnabled(true);
+    public static UserBuilder edit(UserRepresentation rep) {
+        return new UserBuilder(rep);
+    }
+
+    private UserBuilder(UserRepresentation rep) {
+        this.rep = rep;
     }
 
     public UserBuilder id(String id) {
@@ -49,7 +55,10 @@ public class UserBuilder {
         return this;
     }
 
-    public UserBuilder password(String password) {
+    /**
+     * This method adds additional passwords to the user.
+     */
+    public UserBuilder addPassword(String password) {
         if (rep.getCredentials() == null) {
             rep.setCredentials(new LinkedList<CredentialRepresentation>());
         }
@@ -62,6 +71,24 @@ public class UserBuilder {
         return this;
     }
 
+    /**
+     * This method makes sure that there is one single password for the user.
+     */
+    public UserBuilder password(String password) {
+        rep.setCredentials(null);
+        return addPassword(password);
+    }
+
+    public UserBuilder email(String email) {
+        rep.setEmail(email);
+        return this;
+    }
+
+    public UserBuilder enabled(boolean enabled) {
+        rep.setEnabled(enabled);
+        return this;
+    }
+
     public UserBuilder role(String role) {
         if (rep.getRealmRoles() == null) {
             rep.setRealmRoles(new LinkedList<String>());