diff --git a/model/src/test/java/org/cloudfoundry/identity/uaa/zone/UserConfigTest.java b/model/src/test/java/org/cloudfoundry/identity/uaa/zone/UserConfigTest.java
index 7ca755c87d8..b0b7cf05570 100644
--- a/model/src/test/java/org/cloudfoundry/identity/uaa/zone/UserConfigTest.java
+++ b/model/src/test/java/org/cloudfoundry/identity/uaa/zone/UserConfigTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
@@ -60,4 +61,19 @@ public void setMaxUsers() {
       userConfig.setMaxUsers(100);
       assertEquals(100, userConfig.getMaxUsers());
     }
+
+    @Test
+    public void testDefaultOrigin() {
+        UserConfig userConfig = new UserConfig();
+        assertTrue(userConfig.isAllowOriginLoop());
+        assertFalse(userConfig.isCheckOriginEnabled());
+    }
+
+    @Test
+    public void testOriginLoop() {
+        UserConfig userConfig = new UserConfig();
+        assertTrue(userConfig.isAllowOriginLoop());
+        userConfig.setAllowOriginLoop(false);
+        assertFalse(userConfig.isCheckOriginEnabled());
+    }
 }
diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfiguratorTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfiguratorTests.java
index 890054e04d2..1c9fc34b1d0 100644
--- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfiguratorTests.java
+++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthProviderConfiguratorTests.java
@@ -191,7 +191,7 @@ void retrieve_by_issuer_search() throws Exception {
         IdentityProvider<OIDCIdentityProviderDefinition> activeExternalOAuthProvider = configurator.retrieveByIssuer(issuer, IdentityZone.getUaaZoneId());
 
         assertEquals(issuer, activeExternalOAuthProvider.getConfig().getIssuer());
-        verify(configurator, times(1)).overlay(eq(config));
+        verify(configurator, times(1)).overlay(config);
         verify(configurator, times(1)).retrieveByExternId(anyString(), anyString(), anyString());
     }
 
@@ -216,13 +216,13 @@ void retrieve_by_issuer_legacy() throws Exception {
         IdentityProvider<OIDCIdentityProviderDefinition> activeExternalOAuthProvider = configurator.retrieveByIssuer(issuer, "customer");
 
         assertEquals(issuer, activeExternalOAuthProvider.getConfig().getIssuer());
-        verify(configurator, times(1)).overlay(eq(config));
+        verify(configurator, times(1)).overlay(config);
         verify(configurator, times(1)).retrieveByExternId(anyString(), anyString(), anyString());
         verify(configurator, times(1)).retrieveAll(eq(true), anyString());
     }
 
     @Test
-    void retrieve_by_issuer_not_found_error() throws Exception {
+    void retrieve_by_issuer_not_found_error() {
         when(mockIdentityProviderProvisioning.retrieveByExternId(anyString(), anyString(), anyString())).thenThrow(new EmptyResultDataAccessException(1));
 
         String issuer = "https://accounts.google.com";
@@ -238,7 +238,7 @@ void retrieve_by_issuer_not_found_error() throws Exception {
     }
 
     @Test
-    void retrieve_by_issuer_null_error() throws Exception {
+    void retrieve_by_issuer_null_error() {
         when(mockIdentityProviderProvisioning.retrieveByExternId(anyString(), anyString(), anyString())).thenReturn(null);
 
         String issuer = "https://accounts.google.com";
diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfiguratorTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfiguratorTests.java
index 777da58a87f..edf6dad7330 100644
--- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfiguratorTests.java
+++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlIdentityProviderConfiguratorTests.java
@@ -213,22 +213,20 @@ public void testGetEntityID() throws Exception {
     }
 
     @Test
-    void testGetEntityIDExists() throws Exception {
+    void testGetEntityIDExists() {
         bootstrap.setIdentityProviders(BootstrapSamlIdentityProviderDataTests.parseYaml(BootstrapSamlIdentityProviderDataTests.sampleYaml));
         bootstrap.afterPropertiesSet();
         for (SamlIdentityProviderDefinition def : bootstrap.getIdentityProviderDefinitions()) {
-            switch (def.getIdpEntityAlias()) {
-                case "okta-local-2": {
-                    IdentityProvider idp2 = mock(IdentityProvider.class);
-                    when(idp2.getType()).thenReturn(OriginKeys.SAML);
-                    when(idp2.getConfig()).thenReturn(def.clone().setIdpEntityAlias("okta-local-1"));
-                    when(provisioning.retrieveActive(anyString())).thenReturn(Arrays.asList(idp2));
-                    assertThrowsWithMessageThat(
-                        MetadataProviderException.class,
-                        () -> configurator.validateSamlIdentityProviderDefinition(def, true),
-                        startsWith("Duplicate entity ID:http://www.okta.com")
-                    );
-                }
+            if ("okta-local-2".equalsIgnoreCase(def.getIdpEntityAlias())) {
+                IdentityProvider idp2 = mock(IdentityProvider.class);
+                when(idp2.getType()).thenReturn(OriginKeys.SAML);
+                when(idp2.getConfig()).thenReturn(def.clone().setIdpEntityAlias("okta-local-1"));
+                when(provisioning.retrieveActive(anyString())).thenReturn(Arrays.asList(idp2));
+                assertThrowsWithMessageThat(
+                    MetadataProviderException.class,
+                    () -> configurator.validateSamlIdentityProviderDefinition(def, true),
+                    startsWith("Duplicate entity ID:http://www.okta.com")
+                );
             }
         }
     }