diff --git a/oauth-rest/oauth-client-spring/src/test/java/com/baeldung/client/ClientContextIntegrationTest.java b/oauth-rest/oauth-client-spring/src/test/java/com/baeldung/client/ClientContextIntegrationTest.java
index c84e92544..a89aa5d62 100644
--- a/oauth-rest/oauth-client-spring/src/test/java/com/baeldung/client/ClientContextIntegrationTest.java
+++ b/oauth-rest/oauth-client-spring/src/test/java/com/baeldung/client/ClientContextIntegrationTest.java
@@ -4,10 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest(classes = { ClientSpringApp.class })
-public class ClientContextIntegrationTest {
+class ClientContextIntegrationTest {
 
 	@Test
-	public void whenLoadApplication_thenSuccess() {
+	void whenLoadApplication_thenSuccess() {
 
 	}
 
diff --git a/oauth-rest/oauth-client-spring/src/test/java/com/baeldung/client/Oauth2ClientIntegrationTest.java b/oauth-rest/oauth-client-spring/src/test/java/com/baeldung/client/Oauth2ClientIntegrationTest.java
index f640e8e54..2b3f8d35a 100644
--- a/oauth-rest/oauth-client-spring/src/test/java/com/baeldung/client/Oauth2ClientIntegrationTest.java
+++ b/oauth-rest/oauth-client-spring/src/test/java/com/baeldung/client/Oauth2ClientIntegrationTest.java
@@ -1,6 +1,7 @@
 package com.baeldung.client;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.startsWith;
 
@@ -102,7 +103,7 @@ public void beforeEach() throws Exception {
     }
 
     @Test
-    public void givenAuthServerAndResourceServer_whenPerformClientLoginProcess_thenProcessExecutesOk() throws Exception {
+    void givenAuthServerAndResourceServer_whenPerformClientLoginProcess_thenProcessExecutesOk() throws Exception {
         // mimic login button action
         ExchangeResult result = this.webTestClient.get()
             .uri(CLIENT_SECURED_URL)
@@ -165,7 +166,7 @@ public void givenAuthServerAndResourceServer_whenPerformClientLoginProcess_thenP
             .expectStatus()
             .isFound()
             .expectHeader()
-            .value(HttpHeaders.LOCATION, endsWith(CLIENT_SECURED_URL))
+            .value(HttpHeaders.LOCATION, containsString(CLIENT_SECURED_URL))
             .returnResult(Void.class);
 
         // assert that Access Token Endpoint was requested as expected
diff --git a/oauth-rest/oauth-client-spring/src/test/resources/application.yml b/oauth-rest/oauth-client-spring/src/test/resources/application.yml
new file mode 100644
index 000000000..4ac36ee75
--- /dev/null
+++ b/oauth-rest/oauth-client-spring/src/test/resources/application.yml
@@ -0,0 +1,36 @@
+spring:
+  security:
+    oauth2:
+      client:
+        registration:
+          custom:
+            client-id: newClient
+            client-secret: newClientSecret
+            scope: read,write
+            authorization-grant-type: authorization_code
+            redirect-uri: http://localhost:8082/oauth-client-spring/login/oauth2/code/custom
+        provider:
+          custom:
+            authorization-uri: http://localhost:8083/auth/realms/baeldung/protocol/openid-connect/auth
+            token-uri: http://localhost:8083/auth/realms/baeldung/protocol/openid-connect/token
+            user-info-uri: http://localhost:8083/auth/realms/baeldung/protocol/openid-connect/userinfo
+            user-name-attribute: preferred_username
+  thymeleaf:
+    cache: false
+  devtools:
+    livereload:
+      port: 35729
+
+server: 
+  port: 8082
+  servlet: 
+    context-path: /oauth-client-spring
+    
+logging: 
+  level: 
+    org.springframework: INFO
+
+resourceserver:
+  api:
+    foo:
+      url: http://localhost:8081/resource-server/api/foos/
\ No newline at end of file
diff --git a/oauth-rest/pom.xml b/oauth-rest/pom.xml
index 42dbd5d33..3a347f548 100644
--- a/oauth-rest/pom.xml
+++ b/oauth-rest/pom.xml
@@ -21,7 +21,6 @@
         <module>oauth-ui-authorization-code-angular</module>
         <module>oauth-ui-authorization-code-angular-zuul</module>
         <module>oauth-client-spring</module>
-        <module>keycloak-custom-protocol-mapper</module>
     </modules>
 
 </project>