diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountLogPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountLogPage.java
deleted file mode 100755
index 9775d0c1060..00000000000
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountLogPage.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.testsuite.pages;
-
-import org.keycloak.services.Urls;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class AccountLogPage extends AbstractAccountPage {
-
-    public boolean isCurrent() {
-        return driver.getTitle().contains("Account Management") && driver.getCurrentUrl().endsWith("/account/log");
-    }
-
-    private String getPath() {
-        return Urls.accountLogPage(getAuthServerRoot(), "test").toString();
-    }
-
-    public void open() {
-        driver.navigate().to(getPath());
-    }
-
-    public List<List<String>> getEvents() {
-        List<List<String>> table = new LinkedList<List<String>>();
-        for (WebElement r : driver.findElements(By.tagName("tr"))) {
-            List<String> row = new LinkedList<String>();
-            for (WebElement col : r.findElements(By.tagName("td"))) {
-                row.add(col.getText());
-            }
-            table.add(row);
-        }
-        table.remove(0);
-        return table;
-    }
-
-}
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountSessionsPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountSessionsPage.java
deleted file mode 100755
index d6c04855806..00000000000
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AccountSessionsPage.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.keycloak.testsuite.pages;
-
-import org.keycloak.services.Urls;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.FindBy;
-
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class AccountSessionsPage extends AbstractAccountPage {
-
-    private String realmName = "test";
-
-    @FindBy(id = "logout-all-sessions")
-    private WebElement logoutAllLink;
-
-
-    public boolean isCurrent() {
-        return driver.getTitle().contains("Account Management") && driver.getCurrentUrl().endsWith("/account/sessions");
-    }
-
-    public void realm(String realmName) {
-        this.realmName = realmName;
-    }
-
-    public String getPath() {
-        return Urls.accountSessionsPage(getAuthServerRoot(), realmName).toString();
-    }
-
-    public void open() {
-        driver.navigate().to(getPath());
-    }
-
-    public void logoutAll() {
-        logoutAllLink.click();
-    }
-
-    public List<List<String>> getSessions() {
-        List<List<String>> table = new LinkedList<List<String>>();
-        for (WebElement r : driver.findElements(By.tagName("tr"))) {
-            List<String> row = new LinkedList<String>();
-            for (WebElement col : r.findElements(By.tagName("td"))) {
-                row.add(col.getText());
-            }
-            table.add(row);
-        }
-        table.remove(0);
-        return table;
-    }
-
-}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountBrokerTest.java
deleted file mode 100755
index 44244fda94a..00000000000
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountBrokerTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.testsuite.account;
-
-import org.jboss.arquillian.graphene.page.Page;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.keycloak.admin.client.resource.IdentityProviderResource;
-import org.keycloak.admin.client.resource.RealmResource;
-import org.keycloak.representations.idm.ClientRepresentation;
-import org.keycloak.representations.idm.IdentityProviderRepresentation;
-import org.keycloak.representations.idm.UserRepresentation;
-import org.keycloak.testsuite.admin.ApiUtil;
-import org.keycloak.testsuite.broker.AbstractBaseBrokerTest;
-import org.keycloak.testsuite.broker.BrokerConfiguration;
-import org.keycloak.testsuite.broker.KcOidcBrokerConfiguration;
-import org.keycloak.testsuite.pages.AccountFederatedIdentityPage;
-import org.keycloak.testsuite.util.UserBuilder;
-
-import javax.ws.rs.core.Response;
-
-import java.util.List;
-
-import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient;
-import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc.
- */
-public class AccountBrokerTest extends AbstractBaseBrokerTest {
-
-    @Page
-    protected AccountFederatedIdentityPage identityPage;
-
-    @Override
-    protected BrokerConfiguration getBrokerConfiguration() {
-        return KcOidcBrokerConfiguration.INSTANCE;
-    }
-
-    @Before
-    public void createUser() {
-        log.debug("creating user for realm " + bc.providerRealmName());
-
-        UserRepresentation user = new UserRepresentation();
-        user.setUsername(bc.getUserLogin());
-        user.setEmail(bc.getUserEmail());
-        user.setEmailVerified(true);
-        user.setEnabled(true);
-
-        RealmResource realmResource = adminClient.realm(bc.providerRealmName());
-        userId = createUserWithAdminClient(realmResource, user);
-
-        resetUserPassword(realmResource.users().get(userId), bc.getUserPassword(), false);
-    }
-
-    @Before
-    public void addIdentityProviderToProviderRealm() {
-        log.debug("adding identity provider to realm " + bc.consumerRealmName());
-
-        RealmResource realm = adminClient.realm(bc.consumerRealmName());
-        realm.identityProviders().create(bc.setUpIdentityProvider()).close();
-        realm.identityProviders().get(bc.getIDPAlias());
-    }
-
-    @Before
-    public void addClients() {
-        List<ClientRepresentation> clients = bc.createProviderClients();
-        if (clients != null) {
-            RealmResource providerRealm = adminClient.realm(bc.providerRealmName());
-            for (ClientRepresentation client : clients) {
-                log.debug("adding client " + client.getName() + " to realm " + bc.providerRealmName());
-
-                // Remove default client scopes for this test
-//                client.setDefaultClientScopes(Collections.emptyList());
-
-                fixAuthServerHostAndPortForClientRepresentation(client);
-
-                providerRealm.clients().create(client).close();
-            }
-        }
-
-        clients = bc.createConsumerClients();
-        if (clients != null) {
-            RealmResource consumerRealm = adminClient.realm(bc.consumerRealmName());
-            for (ClientRepresentation client : clients) {
-                log.debug("adding client " + client.getName() + " to realm " + bc.consumerRealmName());
-
-                fixAuthServerHostAndPortForClientRepresentation(client);
-
-                consumerRealm.clients().create(client).close();
-            }
-        }
-    }
-
-    @Before
-    public void before() {
-        Response response = adminClient.realm(KcOidcBrokerConfiguration.INSTANCE.consumerRealmName()).users().create(UserBuilder.create().username("accountbrokertest").build());
-        String userId = ApiUtil.getCreatedId(response);
-        ApiUtil.resetUserPassword(adminClient.realm(KcOidcBrokerConfiguration.INSTANCE.consumerRealmName()).users().get(userId), "password", false);
-    }
-
-    @After
-    public void after() {
-        RealmResource consumerRealm = adminClient.realm(KcOidcBrokerConfiguration.INSTANCE.consumerRealmName());
-        UserRepresentation userRep = ApiUtil.findUserByUsername(consumerRealm, "accountbrokertest");
-        if (userRep != null) {
-            consumerRealm.users().get(userRep.getId()).remove();
-        }
-    }
-
-    @Test
-    public void add() {
-        identityPage.realm(KcOidcBrokerConfiguration.INSTANCE.consumerRealmName());
-        identityPage.open();
-        loginPage.login("accountbrokertest", "password");
-        Assert.assertTrue(identityPage.isCurrent());
-
-        List<AccountFederatedIdentityPage.FederatedIdentity> identities = identityPage.getIdentities();
-        Assert.assertEquals(1, identities.size());
-
-        Assert.assertEquals("kc-oidc-idp", identities.get(0).getProvider());
-        Assert.assertEquals("", identities.get(0).getSubject());
-        Assert.assertEquals("add-link-kc-oidc-idp", identities.get(0).getAction().getAttribute("id"));
-
-        identities.get(0).getAction().click();
-
-        loginPage.login(bc.getUserLogin(), bc.getUserPassword());
-
-        Assert.assertTrue(identityPage.isCurrent());
-
-        identities = identityPage.getIdentities();
-        Assert.assertEquals(1, identities.size());
-
-        Assert.assertEquals("kc-oidc-idp", identities.get(0).getProvider());
-        Assert.assertEquals("testuser", identities.get(0).getSubject());
-        Assert.assertEquals("remove-link-kc-oidc-idp", identities.get(0).getAction().getAttribute("id"));
-
-        identities.get(0).getAction().click();
-
-        Assert.assertTrue(identityPage.isCurrent());
-
-        identities = identityPage.getIdentities();
-
-        Assert.assertEquals("kc-oidc-idp", identities.get(0).getProvider());
-        Assert.assertEquals("", identities.get(0).getSubject());
-        Assert.assertEquals("add-link-kc-oidc-idp", identities.get(0).getAction().getAttribute("id"));
-    }
-
-    @Test
-    public void displayEnabledIdentityProviders() {
-        identityPage.realm(KcOidcBrokerConfiguration.INSTANCE.consumerRealmName());
-        identityPage.open();
-        loginPage.login("accountbrokertest", "password");
-        Assert.assertTrue(identityPage.isCurrent());
-
-        List<AccountFederatedIdentityPage.FederatedIdentity> identities = identityPage.getIdentities();
-        Assert.assertEquals(1, identities.size());
-
-        // Disable the identity provider
-        RealmResource realm = adminClient.realm(bc.consumerRealmName());
-        IdentityProviderResource providerResource = realm.identityProviders().get(bc.getIDPAlias());
-        IdentityProviderRepresentation provider = providerResource.toRepresentation();
-        provider.setEnabled(false);
-        providerResource.update(provider);
-
-        // Reload federated identities page
-        identityPage.open();
-        Assert.assertTrue(identityPage.isCurrent());
-
-        identities = identityPage.getIdentities();
-        Assert.assertEquals(0, identities.size());
-    }
-
-}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountFormServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountFormServiceTest.java
deleted file mode 100644
index 3026fa2bf46..00000000000
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountFormServiceTest.java
+++ /dev/null
@@ -1,1591 +0,0 @@
-/*
- * Copyright 2016 Red Hat, Inc. and/or its affiliates
- * and other contributors as indicated by the @author tags.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.keycloak.testsuite.account;
-
-import org.jboss.arquillian.drone.api.annotation.Drone;
-import org.jboss.arquillian.graphene.page.Page;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.keycloak.admin.client.resource.RealmResource;
-import org.keycloak.admin.client.resource.UserResource;
-import org.keycloak.common.Profile;
-import org.keycloak.credential.CredentialModel;
-import org.keycloak.events.Details;
-import org.keycloak.events.Errors;
-import org.keycloak.events.EventType;
-import org.keycloak.models.AccountRoles;
-import org.keycloak.models.AdminRoles;
-import org.keycloak.models.Constants;
-import org.keycloak.models.PasswordPolicy;
-import org.keycloak.models.RealmModel;
-import org.keycloak.models.UserModel;
-import org.keycloak.models.credential.OTPCredentialModel;
-import org.keycloak.models.utils.TimeBasedOTP;
-import org.keycloak.representations.idm.ClientRepresentation;
-import org.keycloak.representations.idm.CredentialRepresentation;
-import org.keycloak.representations.idm.EventRepresentation;
-import org.keycloak.representations.idm.RealmRepresentation;
-import org.keycloak.representations.idm.UserRepresentation;
-import org.keycloak.testsuite.AbstractTestRealmKeycloakTest;
-import org.keycloak.testsuite.AssertEvents;
-import org.keycloak.testsuite.admin.ApiUtil;
-import org.keycloak.testsuite.arquillian.AuthServerTestEnricher;
-import org.keycloak.testsuite.arquillian.annotation.DisableFeature;
-import org.keycloak.testsuite.drone.Different;
-import org.keycloak.testsuite.pages.AccountApplicationsPage;
-import org.keycloak.testsuite.pages.AccountFederatedIdentityPage;
-import org.keycloak.testsuite.pages.AccountLogPage;
-import org.keycloak.testsuite.pages.AccountPasswordPage;
-import org.keycloak.testsuite.pages.AccountSessionsPage;
-import org.keycloak.testsuite.pages.AccountTotpPage;
-import org.keycloak.testsuite.pages.AccountUpdateProfilePage;
-import org.keycloak.testsuite.pages.AppPage;
-import org.keycloak.testsuite.pages.AppPage.RequestType;
-import org.keycloak.testsuite.pages.ErrorPage;
-import org.keycloak.testsuite.pages.LoginPage;
-import org.keycloak.testsuite.pages.RegisterPage;
-import org.keycloak.testsuite.updaters.ClientAttributeUpdater;
-import org.keycloak.testsuite.updaters.RoleScopeUpdater;
-import org.keycloak.testsuite.util.DroneUtils;
-import org.keycloak.testsuite.util.IdentityProviderBuilder;
-import org.keycloak.testsuite.util.OAuthClient;
-import org.keycloak.testsuite.util.RealmBuilder;
-import org.keycloak.testsuite.util.UIUtils;
-import org.keycloak.testsuite.util.URLUtils;
-import org.keycloak.testsuite.util.UserBuilder;
-import org.keycloak.userprofile.UserProfileContext;
-
-import java.util.Collections;
-import org.openqa.selenium.By;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebDriver;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.hamcrest.Matchers;
-import org.junit.Assume;
-
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.hasSize;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED;
-import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc.
- */
-@DisableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true)
-public class AccountFormServiceTest extends AbstractTestRealmKeycloakTest {
-
-    public static final String ROOT_URL_CLIENT = "root-url-client";
-    public static final String REALM_NAME = "test";
-
-    @Override
-    public void configureTestRealm(RealmRepresentation testRealm) {
-        //UserRepresentation user = findUserInRealmRep(testRealm, "test-user@localhost");
-        //ClientRepresentation accountApp = findClientInRealmRep(testRealm, ACCOUNT_MANAGEMENT_CLIENT_ID);
-        UserRepresentation user2 = UserBuilder.create()
-                .enabled(true)
-                .username("test-user-no-access@localhost")
-                .email("test-user-no-access@localhost")
-                .password("password")
-                .build();
-        UserRepresentation realmAdmin = UserBuilder.create()
-                .enabled(true)
-                .username("realm-admin")
-                .password("password")
-                .role(Constants.REALM_MANAGEMENT_CLIENT_ID, AdminRoles.REALM_ADMIN)
-                .role(Constants.ACCOUNT_MANAGEMENT_CLIENT_ID, AccountRoles.MANAGE_ACCOUNT)
-                .build();
-
-        testRealm.addIdentityProvider(IdentityProviderBuilder.create()
-                                              .providerId("github")
-                                              .alias("github")
-                                              .build());
-        testRealm.addIdentityProvider(IdentityProviderBuilder.create()
-                                              .providerId("saml")
-                                              .alias("mysaml")
-                                              .build());
-        testRealm.addIdentityProvider(IdentityProviderBuilder.create()
-                                              .providerId("oidc")
-                                              .alias("myoidc")
-                                              .displayName("MyOIDC")
-                                              .build());
-        testRealm.addIdentityProvider(IdentityProviderBuilder.create()
-                                              .providerId("oidc")
-                                              .alias("myhiddenoidc")
-                                              .displayName("MyHiddenOIDC")
-                                              .hideOnLoginPage()
-                                              .build());
-
-        RealmBuilder.edit(testRealm)
-                    .user(user2)
-                    .user(realmAdmin);
-
-        if (AUTH_SERVER_SSL_REQUIRED) {
-            // Some scenarios here use redirections, so we need to fix the base url
-            findTestApp(testRealm)
-                  .setBaseUrl(String.format("%s/auth/realms/master/app/auth", getAuthServerContextRoot()));
-        }
-    }
-
-    // Create second session
-    @Drone
-    @Different
-    WebDriver driver2;
-
-    @Rule
-    public AssertEvents events = new AssertEvents(this);
-
-    @Page
-    protected AppPage appPage;
-
-    @Page
-    protected LoginPage loginPage;
-
-    @Page
-    protected RegisterPage registerPage;
-
-    @Page
-    protected AccountPasswordPage changePasswordPage;
-
-    @Page
-    protected AccountUpdateProfilePage profilePage;
-
-    @Page
-    protected AccountTotpPage totpPage;
-
-    @Page
-    protected AccountLogPage logPage;
-
-    @Page
-    protected AccountSessionsPage sessionsPage;
-
-    @Page
-    protected AccountApplicationsPage applicationsPage;
-    
-    @Page
-    protected AccountFederatedIdentityPage federatedIdentityPage;
-
-    @Page
-    protected ErrorPage errorPage;
-
-    private TimeBasedOTP totp = new TimeBasedOTP();
-    private String userId;
-
-    @Before
-    public void before() {
-        UserRepresentation user = findUser("test-user@localhost");
-
-        user.setEmail("test-user@localhost");
-        updateUser(user);
-
-        userId = user.getId();
-
-        // Revert any password policy and user password changes
-        setPasswordPolicy("");
-        ApiUtil.resetUserPassword(testRealm().users().get(userId), "password", false);
-    }
-
-    @Test
-    public void returnToAppFromQueryParam() {
-        driver.navigate().to(profilePage.getPath() + "?referrer=test-app");
-        loginPage.login("test-user@localhost", "password");
-        Assert.assertTrue(profilePage.isCurrent());
-        profilePage.backToApplication();
-
-        Assert.assertTrue(appPage.isCurrent());
-
-        driver.navigate().to(String.format("%s?referrer=test-app&referrer_uri=%s/auth/realms/master/app/auth?test", profilePage.getPath(), getAuthServerContextRoot()));
-        Assert.assertTrue(profilePage.isCurrent());
-        profilePage.backToApplication();
-
-        Assert.assertTrue(appPage.isCurrent());
-        Assert.assertEquals(oauth.APP_AUTH_ROOT + "?test", driver.getCurrentUrl());
-
-        driver.navigate().to(profilePage.getPath() + "?referrer=test-app");
-        Assert.assertTrue(profilePage.isCurrent());
-
-        driver.findElement(By.linkText("Authenticator")).click();
-        Assert.assertTrue(totpPage.isCurrent());
-
-        driver.findElement(By.linkText("Account")).click();
-        Assert.assertTrue(profilePage.isCurrent());
-
-        profilePage.backToApplication();
-
-        Assert.assertTrue(appPage.isCurrent());
-
-        events.clear();
-    }
-
-    @Test
-    public void referrerEscaped() {
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        driver.navigate().to(profilePage.getPath() + "?referrer=test-app&referrer_uri=http%3A%2F%2Flocalhost%3A8180%2Fauth%2Frealms%2Fmaster%2Fapp%2Fauth%2Ftest%2Ffkrenu%3Fq%3D%2522%253E%253Cscript%253Ealert%25281%2529%253C%252fscript%253E");
-        profilePage.assertCurrent();
-
-        assertFalse(driver.getPageSource().contains("<script>alert"));
-    }
-
-    @Test
-    public void changePassword() {
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        EventRepresentation event = events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-        String sessionId = event.getSessionId();
-        String userId = event.getUserId();
-
-        changePasswordPage.changePassword("", "new-password", "new-password");
-        Assert.assertEquals("Please specify password.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_MISSING).assertEvent();
-
-        changePasswordPage.changePassword("password", "new-password", "new-password2");
-        Assert.assertEquals("Password confirmation doesn't match.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_CONFIRM_ERROR).assertEvent();
-
-        changePasswordPage.changePassword("password", "new-password", "new-password");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-
-        changePasswordPage.logout();
-        events.expectLogout(sessionId).detail(Details.REDIRECT_URI, changePasswordPage.getPath()).assertEvent();
-
-        loginPage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        Assert.assertEquals("Invalid username or password.", loginPage.getInputError());
-
-        events.expectLogin().session((String) null).error(Errors.INVALID_USER_CREDENTIALS)
-                .removeDetail(Details.CONSENT)
-                .assertEvent();
-
-        loginPage.open();
-        loginPage.login("test-user@localhost", "new-password");
-
-        Assert.assertEquals(RequestType.AUTH_RESPONSE, appPage.getRequestType());
-
-        events.expectLogin().assertEvent();
-    }
-
-    private void setPasswordPolicy(String policy) {
-        RealmRepresentation testRealm = testRealm().toRepresentation();
-        testRealm.setPasswordPolicy(policy);
-        testRealm().update(testRealm);
-    }
-
-    @Test
-    public void changePasswordWithBlankCurrentPassword() {
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("", "new", "new");
-        Assert.assertEquals("Please specify password.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_MISSING).assertEvent();
-
-        changePasswordPage.changePassword("password", "new", "new");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-    @Test
-    public void changePasswordWithLengthPasswordPolicy() {
-        setPasswordPolicy("length(8)");
-
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("password", "1234", "1234");
-        Assert.assertEquals("Invalid password: minimum length 8.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_REJECTED).assertEvent();
-
-        changePasswordPage.changePassword("password", "12345678", "12345678");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-    @Test
-    public void changePasswordWithDigitsPolicy() {
-        setPasswordPolicy("digits(2)");
-
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("password", "invalidPassword1", "invalidPassword1");
-        Assert.assertEquals("Invalid password: must contain at least 2 numerical digits.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_REJECTED).assertEvent();
-
-        changePasswordPage.changePassword("password", "validPassword12", "validPassword12");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-    @Test
-    public void changePasswordWithLowerCasePolicy() {
-        setPasswordPolicy("lowerCase(2)");
-
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("password", "iNVALIDPASSWORD", "iNVALIDPASSWORD");
-        Assert.assertEquals("Invalid password: must contain at least 2 lower case characters.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_REJECTED).assertEvent();
-
-        changePasswordPage.changePassword("password", "vaLIDPASSWORD", "vaLIDPASSWORD");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-    @Test
-    public void changePasswordWithUpperCasePolicy() {
-        setPasswordPolicy("upperCase(2)");
-
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("password", "Invalidpassword", "Invalidpassword");
-        Assert.assertEquals("Invalid password: must contain at least 2 upper case characters.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_REJECTED).assertEvent();
-
-
-        changePasswordPage.changePassword("password", "VAlidpassword", "VAlidpassword");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-    @Test
-    public void changePasswordWithSpecialCharsPolicy() {
-        setPasswordPolicy("specialChars(2)");
-
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("password", "invalidPassword*", "invalidPassword*");
-        Assert.assertEquals("Invalid password: must contain at least 2 special characters.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_REJECTED).assertEvent();
-
-
-        changePasswordPage.changePassword("password", "validPassword*#", "validPassword*#");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-    @Test
-    public void changePasswordWithNotUsernamePolicy() {
-        setPasswordPolicy("notUsername(1)");
-
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("password", "test-user@localhost", "test-user@localhost");
-        Assert.assertEquals("Invalid password: must not be equal to the username.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_REJECTED).assertEvent();
-
-
-        changePasswordPage.changePassword("password", "newPassword", "newPassword");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-    // KEYCLOAK-12729
-    @Test
-    public void changePasswordWithNotEmailPolicy() {
-        setPasswordPolicy("notEmail(1)");
-
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("password", "test-user@localhost", "test-user@localhost");
-        Assert.assertEquals("Invalid password: must not be equal to the email.", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_REJECTED).assertEvent();
-
-        changePasswordPage.changePassword("password", "newPassword", "newPassword");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-    @Test
-    public void changePasswordWithRegexPatternsPolicy() {
-        setPasswordPolicy("regexPattern(^[A-Z]+#[a-z]{8}$)");
-
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        changePasswordPage.changePassword("password", "invalidPassword", "invalidPassword");
-        Assert.assertEquals("Invalid password: fails to match regex pattern(s).", profilePage.getError());
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).error(Errors.PASSWORD_REJECTED).assertEvent();
-
-
-        changePasswordPage.changePassword("password", "VALID#password", "VALID#password");
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).assertEvent();
-    }
-
-     private void assertChangePasswordSucceeds(String currentPassword, String newPassword) {
-        changePasswordPage.changePassword(currentPassword, newPassword, newPassword);
-        Assert.assertEquals("Your password has been updated.", profilePage.getSuccess());
-        events.expectAccount(EventType.UPDATE_PASSWORD).user(userId).assertEvent();
-    }
-
-     private void assertChangePasswordFails(String currentPassword, String newPassword) {
-        changePasswordPage.changePassword(currentPassword, newPassword, newPassword);
-        Assert.assertThat(profilePage.getError(), containsString("Invalid password: must not be equal to any of last"));
-        events.expectAccount(EventType.UPDATE_PASSWORD_ERROR).user(userId).error(Errors.PASSWORD_REJECTED).assertEvent();
-    }
-
-    private void assertNumberOfStoredCredentials(int expectedNumberOfStoredCredentials) {
-        Assume.assumeTrue("Works only on auth-server-undertow",
-                AuthServerTestEnricher.AUTH_SERVER_CONTAINER.equals(AuthServerTestEnricher.AUTH_SERVER_CONTAINER_DEFAULT));
-
-        final String uId = userId;  // Needed for run-on-server
-        testingClient.server("test").run(session -> {
-            RealmModel realm = session.getContext().getRealm();
-            UserModel user = session.users().getUserById(realm, uId);
-            assertThat(user, Matchers.notNullValue());
-            List<CredentialModel> storedCredentials = user.credentialManager().getStoredCredentialsStream().collect(Collectors.toList());
-            assertThat(storedCredentials, Matchers.hasSize(expectedNumberOfStoredCredentials));
-        });
-    }
-
-    @Test
-    public void changePasswordWithPasswordHistoryPolicyThreePasswords() {
-        userId = createUser("test", "user-changePasswordWithPasswordHistoryPolicyThreePasswords", "password");
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(3)");
-
-        changePasswordPage.open();
-        loginPage.login("user-changePasswordWithPasswordHistoryPolicyThreePasswords", "password");
-        events.expectLogin().user(userId).client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        assertChangePasswordFails   ("password",  "password");  // current: password
-        assertNumberOfStoredCredentials(1);
-        assertChangePasswordSucceeds("password",  "password3"); // current: password
-        assertNumberOfStoredCredentials(2);
-
-        assertChangePasswordFails   ("password3", "password");  // current: password3, history: password
-        assertNumberOfStoredCredentials(2);
-        assertChangePasswordFails   ("password3", "password3"); // current: password1, history: password
-        assertNumberOfStoredCredentials(2);
-        assertChangePasswordSucceeds("password3", "password4"); // current: password1, history: password
-        assertNumberOfStoredCredentials(3);
-
-        assertChangePasswordFails   ("password4", "password");  // current: password4, history: password3, password
-        assertNumberOfStoredCredentials(3);
-        assertChangePasswordFails   ("password4", "password3"); // current: password4, history: password3, password
-        assertNumberOfStoredCredentials(3);
-        assertChangePasswordFails   ("password4", "password4"); // current: password4, history: password3, password
-        assertNumberOfStoredCredentials(3);
-        assertChangePasswordSucceeds("password4", "password5"); // current: password4, history: password3, password
-        assertNumberOfStoredCredentials(3);
-
-        assertChangePasswordSucceeds("password5", "password");  // current: password5, history: password4, password3
-        assertNumberOfStoredCredentials(3);
-    }
-
-    @Test
-    public void changePasswordWithPasswordHistoryPolicyTwoPasswords() {
-        userId = createUser("test", "user-changePasswordWithPasswordHistoryPolicyTwoPasswords", "password");
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(2)");
-
-        changePasswordPage.open();
-        loginPage.login("user-changePasswordWithPasswordHistoryPolicyTwoPasswords", "password");
-        events.expectLogin().user(userId).client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        assertChangePasswordFails   ("password",  "password");  // current: password
-        assertNumberOfStoredCredentials(1);
-        assertChangePasswordSucceeds("password",  "password1"); // current: password
-        assertNumberOfStoredCredentials(2);
-
-        assertChangePasswordFails   ("password1", "password");  // current: password1, history: password
-        assertNumberOfStoredCredentials(2);
-        assertChangePasswordFails   ("password1", "password1"); // current: password1, history: password
-        assertNumberOfStoredCredentials(2);
-        assertChangePasswordSucceeds("password1", "password2"); // current: password1, history: password
-        assertNumberOfStoredCredentials(2);
-
-        assertChangePasswordFails   ("password2", "password1"); // current: password2, history: password1
-        assertNumberOfStoredCredentials(2);
-        assertChangePasswordFails   ("password2", "password2"); // current: password2, history: password1
-        assertNumberOfStoredCredentials(2);
-        assertChangePasswordSucceeds("password2", "password");  // current: password2, history: password1
-        assertNumberOfStoredCredentials(2);
-    }
-
-    @Test
-    public void changePasswordWithPasswordHistoryPolicyOnePwds() {
-        userId = createUser("test", "user-changePasswordWithPasswordHistoryPolicyOnePwds", "password");
-
-        // One password means only the active password is checked
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(1)");
-
-        changePasswordPage.open();
-        loginPage.login("user-changePasswordWithPasswordHistoryPolicyOnePwds", "password");
-        events.expectLogin().user(userId).client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        assertChangePasswordFails   ("password",  "password");  // current: password
-        assertNumberOfStoredCredentials(1);
-        assertChangePasswordSucceeds("password",  "password6"); // current: password
-        assertNumberOfStoredCredentials(1);
-
-        assertChangePasswordFails   ("password6", "password6"); // current: password1
-        assertNumberOfStoredCredentials(1);
-        assertChangePasswordSucceeds("password6", "password");  // current: password1
-        assertNumberOfStoredCredentials(1);
-    }
-
-    @Test
-    public void changePasswordWithPasswordHistoryPolicyZeroPwdsInHistory() {
-        userId = createUser("test", "user-changePasswordWithPasswordHistoryPolicyZeroPwdsInHistory", "password");
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(0)");
-
-        changePasswordPage.open();
-        loginPage.login("user-changePasswordWithPasswordHistoryPolicyZeroPwdsInHistory", "password");
-        events.expectLogin().user(userId).client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        assertChangePasswordFails   ("password",  "password");  // current: password
-        assertNumberOfStoredCredentials(1);
-        assertChangePasswordSucceeds("password",  "password1"); // current: password
-        assertNumberOfStoredCredentials(1);
-
-        assertChangePasswordFails   ("password1", "password1"); // current: password1
-        assertNumberOfStoredCredentials(1);
-        assertChangePasswordSucceeds("password1", "password");  // current: password1
-        assertNumberOfStoredCredentials(1);
-    }
-
-    @Test
-    public void changePasswordToOldOneAfterPasswordHistoryPolicyExpirationChange() {
-        userId = createUser("test", "user-changePasswordToOldOneAfterPasswordHistoryPolicyExpirationChange", "password");
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(3)");
-
-        changePasswordPage.open();
-        loginPage.login("user-changePasswordToOldOneAfterPasswordHistoryPolicyExpirationChange", "password");
-        events.expectLogin().user(userId).client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        assertNumberOfStoredCredentials(1);
-        assertChangePasswordSucceeds("password", "password1");
-        assertNumberOfStoredCredentials(2);
-        assertChangePasswordSucceeds("password1", "password2");
-        assertNumberOfStoredCredentials(3);
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(2)");
-        assertChangePasswordSucceeds("password2", "password");
-    }
-
-    @Test
-    public void changePasswordWithPasswordHistoryPolicyExpiration() {
-        userId = createUser("test", "user-changePasswordWithPasswordHistoryPolicyExpiration", "password");
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(3)");
-
-        changePasswordPage.open();
-        loginPage.login("user-changePasswordWithPasswordHistoryPolicyExpiration", "password");
-        events.expectLogin().user(userId).client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=password").assertEvent();
-
-        assertNumberOfStoredCredentials(1);
-        assertChangePasswordSucceeds("password",  "password2"); // current: password
-        assertNumberOfStoredCredentials(2);
-        assertChangePasswordSucceeds("password2", "password4"); // current: password2, history: password
-        assertNumberOfStoredCredentials(3);
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(2)");
-        assertChangePasswordSucceeds("password4", "password5"); // current: password4, history: password2
-        assertNumberOfStoredCredentials(2);
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(1)");
-        assertChangePasswordSucceeds("password5", "password6"); // current: password5, history: -
-        assertNumberOfStoredCredentials(1);
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(2)");
-        assertChangePasswordSucceeds("password6", "password7"); // current: password6, history: password5
-        assertNumberOfStoredCredentials(2);
-
-        setPasswordPolicy(PasswordPolicy.PASSWORD_HISTORY_ID + "(0)");
-        assertChangePasswordSucceeds("password7", "password8"); // current: password5, history: -
-        assertNumberOfStoredCredentials(1);
-    }
-
-    @Test
-    public void changeProfile() throws Exception {
-        setEditUsernameAllowed(false);
-        setRegistrationEmailAsUsername(false);
-
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl()).assertEvent();
-
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("Tom", profilePage.getFirstName());
-        Assert.assertEquals("Brady", profilePage.getLastName());
-        Assert.assertEquals("test-user@localhost", profilePage.getEmail());
-
-        // All fields are required, so there should be an error when something is missing.
-        profilePage.updateProfile("", "New last", "new@email.com");
-
-        Assert.assertEquals("Please specify first name.", profilePage.getError());
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("new@email.com", profilePage.getEmail());
-
-        events.assertEmpty();
-
-        profilePage.updateProfile("New first", "", "new@email.com");
-
-        Assert.assertEquals("Please specify last name.", profilePage.getError());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("", profilePage.getLastName());
-        Assert.assertEquals("new@email.com", profilePage.getEmail());
-
-        events.assertEmpty();
-
-        profilePage.updateProfile("New first", "New last", "");
-
-        Assert.assertEquals("Please specify email.", profilePage.getError());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("", profilePage.getEmail());
-
-        events.assertEmpty();
-
-        profilePage.clickCancel();
-
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("Tom", profilePage.getFirstName());
-        Assert.assertEquals("Brady", profilePage.getLastName());
-        Assert.assertEquals("test-user@localhost", profilePage.getEmail());
-
-        events.assertEmpty();
-
-        profilePage.updateProfile("New first", "New last", "new@email.com");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("new@email.com", profilePage.getEmail());
-
-        events.expectAccount(EventType.UPDATE_PROFILE)
-                .detail(Details.CONTEXT, UserProfileContext.ACCOUNT_OLD.name())
-                .detail(Details.PREVIOUS_FIRST_NAME, "Tom").detail(Details.UPDATED_FIRST_NAME, "New first")
-                .detail(Details.PREVIOUS_LAST_NAME, "Brady").detail(Details.UPDATED_LAST_NAME, "New last")
-                .detail(Details.PREVIOUS_EMAIL, "test-user@localhost").detail(Details.UPDATED_EMAIL, "new@email.com")
-                .assertEvent();
-
-        // reset user for other tests
-        profilePage.updateProfile("Tom", "Brady", "test-user@localhost");
-        events.clear();
-
-        // Revert
-        setEditUsernameAllowed(true);
-    }
-
-    @Test
-    public void changeProfileWithoutRemoveCustomAttributes() throws Exception {
-        setEditUsernameAllowed(false);
-        setRegistrationEmailAsUsername(false);
-
-        UserResource userResource = testRealm().users().get(userId);
-        UserRepresentation user = userResource.toRepresentation();
-
-        user.setAttributes(new HashMap<>());
-        user.getAttributes().put("custom", Arrays.asList("custom-value"));
-
-        userResource.update(user);
-
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl()).assertEvent();
-
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("Tom", profilePage.getFirstName());
-        Assert.assertEquals("Brady", profilePage.getLastName());
-        Assert.assertEquals("test-user@localhost", profilePage.getEmail());
-
-        profilePage.updateProfile("New first", "New last", "new@email.com");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("new@email.com", profilePage.getEmail());
-
-        events.expectAccount(EventType.UPDATE_PROFILE).detail(Details.PREVIOUS_EMAIL, "test-user@localhost").detail(Details.UPDATED_EMAIL, "new@email.com").assertEvent();
-
-        user = userResource.toRepresentation();
-        assertNotNull(user.getAttributes());
-        assertTrue(user.getAttributes().containsKey("custom"));
-
-        // reset user for other tests
-        profilePage.updateProfile("Tom", "Brady", "test-user@localhost");
-        events.clear();
-
-        // Revert
-        setEditUsernameAllowed(true);
-    }
-
-    @Test
-    public void changeProfileEmailChangeSetsEmailVerified() throws Exception {
-        setEditUsernameAllowed(false);
-        setRegistrationEmailAsUsername(false);
-
-        UserResource userResource = testRealm().users().get(userId);
-        UserRepresentation user = userResource.toRepresentation();
-        user.setEmailVerified(true);
-        userResource.update(user);
-
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl()).assertEvent();
-
-        // email not changed so flag no reset
-        profilePage.updateProfile(profilePage.getFirstName(), "New last", profilePage.getEmail());
-        user = userResource.toRepresentation();
-        assertTrue(user.isEmailVerified());
-        
-        events.expectAccount(EventType.UPDATE_PROFILE).detail(Details.UPDATED_LAST_NAME, "New last").detail(Details.PREVIOUS_LAST_NAME, "Brady").assertEvent();
-        
-        //email changed, flag must be reeset
-        profilePage.updateProfile(profilePage.getFirstName(), profilePage.getLastName(), "new@email.com");
-        Assert.assertEquals("new@email.com", profilePage.getEmail());
-        user = userResource.toRepresentation();
-        assertFalse(user.isEmailVerified());
-
-        events.expectAccount(EventType.UPDATE_PROFILE).detail(Details.PREVIOUS_EMAIL, "test-user@localhost").detail(Details.UPDATED_EMAIL, "new@email.com").assertEvent();
-
-        // reset user for other tests
-        profilePage.updateProfile("Tom", "Brady", "test-user@localhost");
-        events.clear();
-
-        // Revert
-        setEditUsernameAllowed(true);
-    }
-
-    @Test
-    public void changeProfileEmailAsUsernameEnabled() throws Exception {
-        setRegistrationEmailAsUsername(true);
-
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-        assertFalse(driver.findElements(By.id("username")).size() > 0);
-
-        // Revert
-        setRegistrationEmailAsUsername(false);
-
-    }
-
-    // KEYCLOAK-5443
-    @Test
-    public void changeProfileEmailAsUsernameAndEditUsernameEnabled() throws Exception {
-        setEditUsernameAllowed(true);
-        setRegistrationEmailAsUsername(true);
-
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-        assertFalse(driver.findElements(By.id("username")).size() > 0);
-
-        profilePage.updateProfile("New First", "New Last", "new-email@email");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-        Assert.assertEquals("New First", profilePage.getFirstName());
-        Assert.assertEquals("New Last", profilePage.getLastName());
-        Assert.assertEquals("new-email@email", profilePage.getEmail());
-
-        List<UserRepresentation> list = adminClient.realm("test").users().search(null, null, null, "new-email@email", null, null);
-        assertEquals(1, list.size());
-
-        UserRepresentation user = list.get(0);
-
-        assertEquals("new-email@email", user.getUsername());
-
-        // Revert
-
-        user.setUsername("test-user@localhost");
-        user.setFirstName("Tom");
-        user.setLastName("Brady");
-        user.setEmail("test-user@localhost");
-        adminClient.realm("test").users().get(user.getId()).update(user);
-
-        setRegistrationEmailAsUsername(false);
-        setEditUsernameAllowed(false);
-    }
-
-    // KEYCLOAK-8893
-    @Test
-    public void caseInsensitiveSearchWorksWithoutForcingLowercaseOnEmailAttribute() throws Exception {
-        setEditUsernameAllowed(true);
-        setRegistrationEmailAsUsername(true);
-
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-        assertFalse(driver.findElements(By.id("username")).size() > 0);
-
-        profilePage.updateProfile("New First", "New Last", "New-Email@email");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-        Assert.assertEquals("New First", profilePage.getFirstName());
-        Assert.assertEquals("New Last", profilePage.getLastName());
-        Assert.assertEquals("new-email@email", profilePage.getEmail()); // verify attribute is lower case after save
-
-        List<UserRepresentation> list = adminClient.realm("test").users().search(null, null, null, "nEw-emAil@eMail", null, null);
-        assertEquals(1, list.size());
-
-        UserRepresentation user = list.get(0);
-
-        assertEquals("new-email@email", user.getUsername());
-
-        list = adminClient.realm("test").users().search("nEw-emAil@eMail", null, null, null, null, null);
-        assertEquals(1, list.size());
-
-        user = list.get(0);
-
-        assertEquals("new-email@email", user.getUsername());
-
-        list = adminClient.realm("test").users().search(null, "new fIrSt", null, null, null, null);
-        assertEquals(1, list.size());
-
-        user = list.get(0);
-
-        assertEquals("new-email@email", user.getUsername());
-
-        list = adminClient.realm("test").users().search(null, null, "NEw LaST", null, null, null);
-        assertEquals(1, list.size());
-
-        user = list.get(0);
-
-        assertEquals("new-email@email", user.getUsername());
-
-        assertEquals("New First", user.getFirstName());
-        assertEquals("New Last", user.getLastName());
-
-        list = adminClient.realm("test").users().search("nEw-emAil@eMail", 0, 1);
-        assertEquals(1, list.size());
-
-        user = list.get(0);
-
-        assertEquals("new-email@email", user.getUsername());
-
-        list = adminClient.realm("test").users().search("nEw", 0, 1);
-        assertEquals(1, list.size());
-
-        user = list.get(0);
-
-        assertEquals("new-email@email", user.getUsername());
-
-        // Revert
-
-        user.setUsername("test-user@localhost");
-        user.setFirstName("Tom");
-        user.setLastName("Brady");
-        user.setEmail("test-user@localhost");
-        adminClient.realm("test").users().get(user.getId()).update(user);
-
-        setRegistrationEmailAsUsername(false);
-        setEditUsernameAllowed(false);
-    }
-
-    private void setEditUsernameAllowed(boolean allowed) {
-        RealmRepresentation testRealm = testRealm().toRepresentation();
-        testRealm.setEditUsernameAllowed(allowed);
-        testRealm().update(testRealm);
-    }
-
-    private void setRegistrationEmailAsUsername(boolean allowed) {
-        RealmRepresentation testRealm = testRealm().toRepresentation();
-        testRealm.setRegistrationEmailAsUsername(allowed);
-        testRealm().update(testRealm);
-    }
-
-    private void setDuplicateEmailsAllowed(boolean allowed) {
-        RealmRepresentation testRealm = testRealm().toRepresentation();
-        testRealm.setDuplicateEmailsAllowed(allowed);
-        testRealm().update(testRealm);
-    }
-
-    @Test
-    public void changeUsername() {
-        // allow to edit the username in realm
-        setEditUsernameAllowed(true);
-
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl()).assertEvent();
-
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("Tom", profilePage.getFirstName());
-        Assert.assertEquals("Brady", profilePage.getLastName());
-        Assert.assertEquals("test-user@localhost", profilePage.getEmail());
-
-        // All fields are required, so there should be an error when something is missing.
-        profilePage.updateProfile("", "New first", "New last", "new@email.com");
-
-        Assert.assertEquals("Please specify username.", profilePage.getError());
-        Assert.assertEquals("", profilePage.getUsername());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("new@email.com", profilePage.getEmail());
-
-        events.assertEmpty();
-
-        // Change to the username already occupied by other user
-        profilePage.updateProfile("test-user-no-access@localhost", "New first", "New last", "new@email.com");
-
-        Assert.assertEquals("Username already exists.", profilePage.getError());
-        Assert.assertEquals("test-user-no-access@localhost", profilePage.getUsername());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("new@email.com", profilePage.getEmail());
-
-        events.assertEmpty();
-
-        profilePage.updateProfile("test-user-new@localhost", "New first", "New last", "new@email.com");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-        Assert.assertEquals("test-user-new@localhost", profilePage.getUsername());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("new@email.com", profilePage.getEmail());
-
-        // Revert
-        profilePage.updateProfile("test-user@localhost", "Tom", "Brady", "test-user@localhost");
-    }
-
-    private void addUser(String username, String email) {
-        UserRepresentation user = UserBuilder.create()
-                                             .username(username)
-                                             .enabled(true)
-                                             .email(email)
-                                             .firstName("first")
-                                             .lastName("last")
-                                             .build();
-        ApiUtil.createUserAndResetPasswordWithAdminClient(testRealm(), user, "password");
-    }
-
-    @Test
-    public void changeUsernameLoginWithOldUsername() {
-        addUser("change-username", "change-username@localhost");
-        setEditUsernameAllowed(true);
-
-        profilePage.open();
-        loginPage.login("change-username", "password");
-
-        profilePage.updateUsername("change-username-updated");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-
-        profilePage.logout();
-
-        profilePage.open();
-
-        Assert.assertTrue(loginPage.isCurrent());
-
-        loginPage.login("change-username", "password");
-
-        Assert.assertTrue(loginPage.isCurrent());
-        Assert.assertEquals("Invalid username or password.", loginPage.getInputError());
-
-        loginPage.login("change-username-updated", "password");
-    }
-
-    @Test
-    public void changeEmailLoginWithOldEmail() {
-        addUser("change-email", "change-username@localhost");
-        setEditUsernameAllowed(true);
-
-        profilePage.open();
-        loginPage.login("change-username@localhost", "password");
-        profilePage.updateEmail("change-username-updated@localhost");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-
-        profilePage.logout();
-
-        profilePage.open();
-
-        Assert.assertTrue(loginPage.isCurrent());
-
-        loginPage.login("change-username@localhost", "password");
-
-        Assert.assertTrue(loginPage.isCurrent());
-        Assert.assertEquals("Invalid username or password.", loginPage.getInputError());
-
-        loginPage.login("change-username-updated@localhost", "password");
-    }
-
-    // KEYCLOAK-1534
-    @Test
-    public void changeEmailToExistingForbidden() {
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl()).assertEvent();
-
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("test-user@localhost", profilePage.getEmail());
-
-        // Change to the email, which some other user has
-        profilePage.updateProfile("New first", "New last", "test-user-no-access@localhost");
-
-        profilePage.assertCurrent();
-        Assert.assertEquals("Email already exists.", profilePage.getError());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("test-user-no-access@localhost", profilePage.getEmail());
-
-        events.assertEmpty();
-
-        // Change some other things, but not email
-        profilePage.updateProfile("New first", "New last", "test-user@localhost");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-        Assert.assertEquals("New first", profilePage.getFirstName());
-        Assert.assertEquals("New last", profilePage.getLastName());
-        Assert.assertEquals("test-user@localhost", profilePage.getEmail());
-
-        events.expectAccount(EventType.UPDATE_PROFILE).assertEvent();
-
-        // Change email and other things to original values
-        profilePage.updateProfile("Tom", "Brady", "test-user@localhost");
-        events.expectAccount(EventType.UPDATE_PROFILE).assertEvent();
-    }
- 
-    @Test
-    public void changeEmailToExistingAllowed() {
-        setDuplicateEmailsAllowed(true); 
-        
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl()).assertEvent();
-
-        Assert.assertEquals("test-user@localhost", profilePage.getUsername());
-        Assert.assertEquals("test-user@localhost", profilePage.getEmail());
-
-        // Change to the email, which some other user has
-        profilePage.updateProfile("New first", "New last", "test-user-no-access@localhost");
-
-        Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
-    }
-
-    public void totpPageSetup() {
-        String pageSource = driver.getPageSource();
-
-        assertTrue(pageSource.contains("Install one of the following applications on your mobile"));
-        assertTrue(pageSource.contains("FreeOTP"));
-        assertTrue(pageSource.contains("Google Authenticator"));
-
-        assertTrue(pageSource.contains("Open the application and scan the barcode"));
-        assertFalse(pageSource.contains("Open the application and enter the key"));
-
-        assertTrue(pageSource.contains("Unable to scan?"));
-        assertFalse(pageSource.contains("Scan barcode?"));
-    }
-
-    public void totpPageSetupManual() {
-        String pageSource = driver.getPageSource();
-
-        assertTrue(pageSource.contains("Install one of the following applications on your mobile"));
-        assertTrue(pageSource.contains("FreeOTP"));
-        assertTrue(pageSource.contains("Google Authenticator"));
-
-        assertFalse(pageSource.contains("Open the application and scan the barcode"));
-        assertTrue(pageSource.contains("Open the application and enter the key"));
-
-        assertFalse(pageSource.contains("Unable to scan?"));
-        assertTrue(pageSource.contains("Scan barcode?"));
-    }
-
-    @Test
-    public void setupTotp() {
-        totpPage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=totp").assertEvent();
-
-        Assert.assertTrue(totpPage.isCurrent());
-
-        assertFalse(driver.getPageSource().contains("Remove Google"));
-
-        totpPageSetup();
-
-        totpPage.clickManual();
-
-        assertTrue(UIUtils.getTextFromElement(driver.findElement(By.id("kc-totp-secret-key"))).matches("[\\w]{4}( [\\w]{4}){7}"));
-
-        assertEquals("Type: Time-based", driver.findElement(By.id("kc-totp-type")).getText());
-        assertEquals("Algorithm: SHA1", driver.findElement(By.id("kc-totp-algorithm")).getText());
-        assertEquals("Digits: 6", driver.findElement(By.id("kc-totp-digits")).getText());
-        assertEquals("Interval: 30", driver.findElement(By.id("kc-totp-period")).getText());
-
-        // Error with false code
-        totpPage.configure(totp.generateTOTP(totpPage.getTotpSecret() + "123"));
-
-        Assert.assertEquals("Invalid authenticator code.", profilePage.getError());
-
-        totpPage.configure(totp.generateTOTP(totpPage.getTotpSecret()));
-
-        Assert.assertEquals("Mobile authenticator configured.", profilePage.getSuccess());
-
-        events.expectAccount(EventType.UPDATE_TOTP).assertEvent();
-
-        Assert.assertTrue(driver.getPageSource().contains("pficon-delete"));
-
-        totpPage.removeTotp();
-
-        events.expectAccount(EventType.REMOVE_TOTP).assertEvent();
-        // KEYCLOAK-12163
-        totpPageSetupManual();
-
-        accountPage.logOut();
-
-        assertFalse(errorPage.isCurrent());
-    }
-
-
-    @Test
-    public void removeTotpAsDifferentUser() {
-        UserResource user1 = ApiUtil.findUserByUsernameId(testRealm(), "user-with-one-configured-otp");
-        CredentialRepresentation otpCredential = user1.credentials().stream()
-                .filter(credentialRep -> OTPCredentialModel.TYPE.equals(credentialRep.getType()))
-                .findFirst()
-                .get();
-
-        // Login as evil user (test-user@localhost) and setup TOTP
-        totpPage.open();
-        loginPage.login("test-user@localhost", "password");
-        Assert.assertTrue(totpPage.isCurrent());
-
-        totpPageSetup();
-
-        totpPage.configure(totp.generateTOTP(totpPage.getTotpSecret()));
-
-        Assert.assertEquals("Mobile authenticator configured.", profilePage.getSuccess());
-
-        String currentStateChecker = driver.findElement(By.id("stateChecker")).getAttribute("value");
-
-
-        // Try to delete TOTP of "user-with-one-configured-otp" by replace ID of the TOTP credential in the request
-        String currentURL = driver.getCurrentUrl();
-
-        String formParameters = "stateChecker=" + currentStateChecker
-                + "&submitAction=Delete"
-                + "&credentialId=" + otpCredential.getId();
-
-        URLUtils.sendPOSTRequestWithWebDriver(currentURL, formParameters);
-
-        // Assert credential of "user-with-one-configured-otp" was NOT deleted and is still present for the user
-        Assert.assertTrue(user1.credentials().stream()
-                .anyMatch(credentialRepresentation -> credentialRepresentation.getType().equals(OTPCredentialModel.TYPE)));
-
-        // Remove TOTP for "test-user" and logout
-        totpPage.removeTotp();
-        totpPage.logout();
-    }
-
-    @Test
-    public void changeProfileNoAccess() throws Exception {
-        profilePage.open();
-        loginPage.login("test-user-no-access@localhost", "password");
-
-        UserRepresentation noAccessUser = this.findUser("test-user-no-access@localhost");
-        events.expectLogin().client("account").user(noAccessUser.getId())
-                .detail(Details.USERNAME, "test-user-no-access@localhost")
-                .detail(Details.REDIRECT_URI, getAccountRedirectUrl()).assertEvent();
-
-        Assert.assertTrue("Expected errorPage but was " + driver.getTitle() + " (" + driver.getCurrentUrl() + "). Page source: " + driver.getPageSource(), errorPage.isCurrent());
-        Assert.assertEquals("No access", errorPage.getError());
-    }
-
-    private void setEventsEnabled(boolean eventsEnabled) {
-        RealmRepresentation testRealm = testRealm().toRepresentation();
-        testRealm.setEventsEnabled(eventsEnabled);
-        testRealm().update(testRealm);
-    }
-
-
-    @Test
-    public void viewLogNotEnabled() {
-        logPage.open();
-        assertTrue(errorPage.isCurrent());
-        assertEquals("Page not found", errorPage.getError());
-    }
-
-    @Test
-    public void viewLog() {
-        setEventsEnabled(true);
-
-        List<EventRepresentation> expectedEvents = new LinkedList<>();
-
-        loginPage.open();
-        loginPage.clickRegister();
-
-        registerPage.register("view", "log", "view-log@localhost", "view-log", "password", "password");
-
-        expectedEvents.add(events.poll());
-        expectedEvents.add(events.poll());
-
-        profilePage.open();
-        profilePage.updateProfile("view", "log2", "view-log@localhost");
-
-        expectedEvents.add(events.poll());
-
-        logPage.open();
-
-        Assert.assertTrue(logPage.isCurrent());
-
-        List<List<String>> actualEvents = logPage.getEvents();
-
-        Assert.assertEquals(expectedEvents.size(), actualEvents.size());
-
-        for (EventRepresentation e : expectedEvents) {
-            boolean match = false;
-            for (List<String> a : logPage.getEvents()) {
-                if (e.getType().toString().replace('_', ' ').toLowerCase().equals(a.get(1)) &&
-                        e.getIpAddress().equals(a.get(2)) &&
-                        e.getClientId().equals(a.get(3))) {
-                    match = true;
-                    break;
-                }
-            }
-            if (!match) {
-                Assert.fail("Event not found " + e.getType());
-            }
-        }
-
-        setEventsEnabled(false);
-    }
-
-    @Test
-     // we need to do domain name -> ip address to make this test work in remote testing
-    public void sessions() {
-        loginPage.open();
-        loginPage.clickRegister();
-
-        registerPage.register("view", "sessions", "view-sessions@localhost", "view-sessions", "password", "password");
-
-        EventRepresentation registerEvent = events.expectRegister("view-sessions", "view-sessions@localhost").assertEvent();
-        String userId = registerEvent.getUserId();
-
-        events.expectLogin().user(userId).detail(Details.USERNAME, "view-sessions").assertEvent();
-
-        sessionsPage.open();
-
-        Assert.assertTrue(sessionsPage.isCurrent());
-
-        List<List<String>> sessions = sessionsPage.getSessions();
-        assertThat(sessions, hasSize(1));
-        assertThat(sessions.get(0).get(0), anyOf(equalTo("127.0.0.1"), equalTo("0:0:0:0:0:0:0:1")));
-
-        // Create second session
-        try {
-            OAuthClient oauth2 = new OAuthClient();
-            oauth2.init(driver2);
-            oauth2.doLogin("view-sessions", "password");
-
-            EventRepresentation login2Event = events.expectLogin().user(userId).detail(Details.USERNAME, "view-sessions").assertEvent();
-
-            sessionsPage.open();
-            sessions = sessionsPage.getSessions();
-            Assert.assertEquals(2, sessions.size());
-
-            sessionsPage.logoutAll();
-
-            events.expectLogout(registerEvent.getSessionId());
-            events.expectLogout(login2Event.getSessionId());
-        } finally {
-            driver2.close();
-        }
-    }
-
-    //KEYCLOAK-17256
-    @Test
-    public void testHomographicUsername() {
-        loginPage.open();
-        loginPage.clickRegister();
-        String username = "b"+"\u043E"+"b";
-        registerPage.register("bob", "spoof", "bob@spoof.com", username, "password", "password");
-        events.expectRegisterError(username, "bob@spoof.com").error("invalid_registration").assertEvent();
-    }
-
-    // KEYCLOAK-5155
-    @Test
-    public void testConsoleListedInApplications() {
-        applicationsPage.open();
-        loginPage.login("realm-admin", "password");
-        Assert.assertTrue(applicationsPage.isCurrent());
-        Map<String, AccountApplicationsPage.AppEntry> apps = applicationsPage.getApplications();
-        Assert.assertThat(apps.keySet(), hasItems("Admin CLI", "security admin console"));
-        events.clear();
-    }
-
-    @Test
-    
-    public void applicationsVisibilityNoScopesNoConsent() throws Exception {
-        try (ClientAttributeUpdater cau = ClientAttributeUpdater.forClient(adminClient, REALM_NAME, ROOT_URL_CLIENT)
-          .setConsentRequired(false)
-          .setFullScopeAllowed(false)
-          .setDefaultClientScopes(Collections.EMPTY_LIST)
-          .setOptionalClientScopes(Collections.EMPTY_LIST)
-          .update();
-          RoleScopeUpdater rsu = cau.realmRoleScope().update()) {
-            applicationsPage.open();
-            loginPage.login("john-doh@localhost", "password");
-            applicationsPage.assertCurrent();
-
-            Map<String, AccountApplicationsPage.AppEntry> apps = applicationsPage.getApplications();
-            Assert.assertThat(apps.keySet(), containsInAnyOrder(
-              /* "root-url-client", */ "Account", "Account Console", "test-app", "test-app-scope", "third-party", "test-app-authz", "My Named Test App", "Test App Named - ${client_account}", "direct-grant", "custom-audience"));
-
-            rsu.add(testRealm().roles().get("user").toRepresentation())
-              .update();
-
-            driver.navigate().refresh();
-            apps = applicationsPage.getApplications();
-            Assert.assertThat(apps.keySet(), containsInAnyOrder(
-              "root-url-client", "Account", "Account Console", "test-app", "test-app-scope", "third-party", "test-app-authz", "My Named Test App", "Test App Named - ${client_account}", "direct-grant", "custom-audience"));
-        }
-    }
-
-    @Test
-    
-    public void applicationsVisibilityNoScopesAndConsent() throws Exception {
-        try (ClientAttributeUpdater cau = ClientAttributeUpdater.forClient(adminClient, REALM_NAME, ROOT_URL_CLIENT)
-          .setConsentRequired(true)
-          .setFullScopeAllowed(false)
-          .setDefaultClientScopes(Collections.EMPTY_LIST)
-          .setOptionalClientScopes(Collections.EMPTY_LIST)
-          .update()) {
-            applicationsPage.open();
-            loginPage.login("john-doh@localhost", "password");
-            applicationsPage.assertCurrent();
-
-            Map<String, AccountApplicationsPage.AppEntry> apps = applicationsPage.getApplications();
-            Assert.assertThat(apps.keySet(), containsInAnyOrder(
-              "root-url-client", "Account", "Account Console", "test-app", "test-app-scope", "third-party", "test-app-authz", "My Named Test App", "Test App Named - ${client_account}", "direct-grant", "custom-audience"));
-        }
-    }
-
-    // More tests (including revoke) are in OAuthGrantTest and OfflineTokenTest
-    @Test
-    
-    public void applications() {
-        applicationsPage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        events.expectLogin().client("account").detail(Details.REDIRECT_URI, getAccountRedirectUrl() + "?path=applications").assertEvent();
-        applicationsPage.assertCurrent();
-
-        Map<String, AccountApplicationsPage.AppEntry> apps = applicationsPage.getApplications();
-        Assert.assertThat(apps.keySet(), containsInAnyOrder("root-url-client", "Account", "Account Console", "test-app", "test-app-scope", "third-party", "test-app-authz", "My Named Test App", "Test App Named - ${client_account}", "direct-grant", "custom-audience"));
-
-        AccountApplicationsPage.AppEntry accountEntry = apps.get("Account");
-        Assert.assertThat(accountEntry.getRolesAvailable(), containsInAnyOrder(
-          "Manage account links in Account",
-          "Manage account in Account",
-          "View profile in Account",
-          "Offline access"
-        ));
-        Assert.assertThat(accountEntry.getClientScopesGranted(), containsInAnyOrder("Full Access"));
-        Assert.assertEquals(oauth.AUTH_SERVER_ROOT + "/realms/test/account/", accountEntry.getHref());
-
-        AccountApplicationsPage.AppEntry testAppEntry = apps.get("test-app");
-        Assert.assertEquals(6, testAppEntry.getRolesAvailable().size());
-        Assert.assertTrue(testAppEntry.getRolesAvailable().contains("Offline access"));
-        Assert.assertTrue(testAppEntry.getClientScopesGranted().contains("Full Access"));
-        Assert.assertEquals(oauth.APP_AUTH_ROOT, testAppEntry.getHref());
-
-        AccountApplicationsPage.AppEntry thirdPartyEntry = apps.get("third-party");
-        Assert.assertEquals(3, thirdPartyEntry.getRolesAvailable().size());
-        Assert.assertTrue(thirdPartyEntry.getRolesAvailable().contains("Have User privileges"));
-        Assert.assertTrue(thirdPartyEntry.getRolesAvailable().contains("Have Customer User privileges in test-app"));
-        Assert.assertEquals(0, thirdPartyEntry.getClientScopesGranted().size());
-        Assert.assertEquals("http://localhost:8180/auth/realms/master/app/auth", thirdPartyEntry.getHref());
-
-        AccountApplicationsPage.AppEntry testAppNamed = apps.get("Test App Named - ${client_account}");
-        Assert.assertEquals("http://localhost:8180/varnamedapp/base", testAppNamed.getHref());
-
-        AccountApplicationsPage.AppEntry rootUrlClient = apps.get("root-url-client");
-        Assert.assertEquals("http://localhost:8180/foo/bar/baz", rootUrlClient.getHref());
-
-        AccountApplicationsPage.AppEntry authzApp = apps.get("test-app-authz");
-        Assert.assertEquals(oauth.SERVER_ROOT + "/test-app-authz", authzApp.getHref());
-
-        AccountApplicationsPage.AppEntry namedApp = apps.get("My Named Test App");
-        Assert.assertEquals("http://localhost:8180/namedapp/base", namedApp.getHref());
-
-        AccountApplicationsPage.AppEntry testAppScope = apps.get("test-app-scope");
-        Assert.assertNull(testAppScope.getHref());
-    }
-
-    @Test
-    public void loginToSpecificPage() {
-        changePasswordPage.open();
-        loginPage.login("test-user@localhost", "password");
-
-        Assert.assertTrue(changePasswordPage.isCurrent());
-
-        events.clear();
-    }
-
-    @Test
-    public void loginToSpecificPageWithReferrer() {
-        driver.navigate().to(changePasswordPage.getPath() + "?referrer=account");
-        System.out.println(driver.getCurrentUrl());
-
-        loginPage.login("test-user@localhost", "password");
-        System.out.println(driver.getCurrentUrl());
-
-        Assert.assertTrue(changePasswordPage.isCurrent());
-
-        events.clear();
-    }
-
-    @Test
-    public void testIdentityProviderCapitalization(){
-        loginPage.open();
-        Assert.assertEquals("GitHub", loginPage.findSocialButton("github").getText());
-        Assert.assertEquals("mysaml", loginPage.findSocialButton("mysaml").getText());
-        Assert.assertEquals("MyOIDC", loginPage.findSocialButton("myoidc").getText());
-    }
-    
-    @Test
-    public void testIdentityProviderHiddenOnLoginPageIsVisbleInAccount(){
-        federatedIdentityPage.open();
-        loginPage.login("test-user@localhost", "password");
-        Assert.assertNotNull(federatedIdentityPage.findAddProvider("myhiddenoidc"));
-    }
-
-    @Test
-    public void testInvalidReferrer() {
-        driver.navigate().to(profilePage.getPath() + "?referrer=test-app");
-        loginPage.login("test-user@localhost", "password");
-        Assert.assertTrue(profilePage.isCurrent());
-        profilePage.backToApplication();
-
-        Assert.assertTrue(appPage.isCurrent());
-
-        driver.navigate().to(profilePage.getPath() + "?referrer=test-invalid&referrer_uri=http://localhost:8180/auth/realms/master/app/auth?test");
-        Assert.assertTrue(profilePage.isCurrent());
-
-        events.clear();
-    }
-
-    @Test
-    public void testReferrerLinkContents() {
-        RealmResource testRealm = testRealm();
-        List<ClientRepresentation> foundClients = testRealm.clients().findByClientId("named-test-app");
-        if (foundClients.isEmpty()) {
-            Assert.fail("Unable to find named-test-app");
-        }
-        ClientRepresentation namedClient = foundClients.get(0);
-        
-        driver.navigate().to(profilePage.getPath() + "?referrer=" + namedClient.getClientId());
-        loginPage.login("test-user@localhost", "password");
-        Assert.assertTrue(profilePage.isCurrent());
-        // When a client has a name provided, the name should be available to the back link
-        Assert.assertEquals("Back to " + namedClient.getName(), profilePage.getBackToApplicationLinkText());
-        Assert.assertEquals(namedClient.getBaseUrl(), profilePage.getBackToApplicationLinkHref());
-
-        foundClients = testRealm.clients().findByClientId("var-named-test-app");
-        if (foundClients.isEmpty()) {
-            Assert.fail("Unable to find var-named-test-app");
-        }
-        namedClient = foundClients.get(0);
-
-        driver.navigate().to(profilePage.getPath() + "?referrer=" + namedClient.getClientId());
-        Assert.assertTrue(profilePage.isCurrent());
-        // When a client has a name provided as a variable, the name should be resolved using a localized bundle and available to the back link
-        Assert.assertEquals("Back to Test App Named - Account", profilePage.getBackToApplicationLinkText());
-        Assert.assertEquals(namedClient.getBaseUrl(), profilePage.getBackToApplicationLinkHref());
-
-
-        foundClients = testRealm.clients().findByClientId("test-app");
-        if (foundClients.isEmpty()) {
-            Assert.fail("Unable to find test-app");
-        }
-        ClientRepresentation namelessClient = foundClients.get(0);
-        
-        driver.navigate().to(profilePage.getPath() + "?referrer=" + namelessClient.getClientId());
-        Assert.assertTrue(profilePage.isCurrent());
-        // When a client has no name provided, the client-id should be available to the back link
-        Assert.assertEquals("Back to " + namelessClient.getClientId(), profilePage.getBackToApplicationLinkText());
-        Assert.assertEquals(namelessClient.getBaseUrl(), profilePage.getBackToApplicationLinkHref());
-
-        driver.navigate().to(profilePage.getPath() + "?referrer=test-invalid");
-        Assert.assertTrue(profilePage.isCurrent());
-        // When a client is invalid, the back link should not exist
-        Assert.assertNull(profilePage.getBackToApplicationLinkText());
-
-        events.clear();
-    }
-
-    @Test
-    public void testNoPublicKeyCredentialRelatedElementsPresentOnEditAccountScreen() {
-        profilePage.open();
-        loginPage.login("test-user@localhost", "password");
-        Assert.assertTrue(profilePage.isCurrent());
-
-        int noSuchElementExceptionCount = 0;
-        for (String pkcElementId : Arrays.asList("user.attributes.public_key_credential_id",
-                                                 "user.attributes.public_key_credential_label",
-                                                 "user.attributes.public_key_credential_aaguid")) {
-            try {
-                DroneUtils.getCurrentDriver().findElement(By.id(pkcElementId));
-            } catch (NoSuchElementException nsee) {
-                // Expected to happen in every iteration of the for loop
-                noSuchElementExceptionCount++;
-            }
-        }
-        // None of PK credential ID, label, and AAGUID can be present on Edit Account screen
-        assertEquals(3, noSuchElementExceptionCount);
-    }
-}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java
index 1ecebf58eec..2746cb1745d 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomThemeTest.java
@@ -27,10 +27,8 @@ import org.keycloak.events.Details;
 import org.keycloak.events.EventType;
 import org.keycloak.representations.idm.RealmRepresentation;
 import org.keycloak.representations.idm.UserRepresentation;
-import org.keycloak.services.resources.account.AccountFormService;
 import org.keycloak.testsuite.AssertEvents;
 import org.keycloak.testsuite.AbstractTestRealmKeycloakTest;
-import org.keycloak.testsuite.account.AccountFormServiceTest;
 import org.keycloak.testsuite.pages.AccountUpdateProfilePage;
 import org.keycloak.testsuite.pages.LoginPage;
 import org.keycloak.testsuite.util.RealmBuilder;