diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
index 829eca0d367e454d669a44ccb6d0846e1154dda9..cda6dbbc0551aa887d9ac5b1e0cf32ed86401d1d 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlAttributeServiceTest.java
@@ -343,7 +343,7 @@ class SamlAttributeServiceTest {
 	}
 
 	@Nested
-	class TestDecryptAttributes {
+	class TestDecryptSamlAttributes {
 
 		@Mock
 		private Response token;
@@ -368,33 +368,33 @@ class SamlAttributeServiceTest {
 
 		@Test
 		void shouldCallDecryptAssertion() {
-			decryptAttributes();
+			decryptSamlAttributes();
 
 			verify(service).decryptAssertion(encryptedAssertion);
 		}
 
 		@Test
 		void shouldCallGetAttributeStatement() {
-			decryptAttributes();
+			decryptSamlAttributes();
 
 			verify(service).getAttributeStatement(assertion);
 		}
 
 		@Test
 		void shouldCallGetAttributeValues() {
-			decryptAttributes();
+			decryptSamlAttributes();
 
 			verify(service).getAttributeValues(attribute);
 		}
 
 		@Test
 		void shouldReturnAttributes() {
-			var result = decryptAttributes();
+			var result = decryptSamlAttributes();
 
 			assertThat(result).isEqualTo(TokenAttributeTestFactory.asMap());
 		}
 
-		private Map<String, String> decryptAttributes() {
+		private Map<String, String> decryptSamlAttributes() {
 			return service.decryptSamlAttributes(token);
 		}
 	}
@@ -663,14 +663,14 @@ class SamlAttributeServiceTest {
 			@BeforeEach
 			void init() {
 				when(tokenValidationProperty.isUseIdAsPostfachId()).thenReturn(false);
-				doReturn(TokenAttributeTestFactory.VALUE).when(service).getMappedValue(any(), any());
+				doReturn(TokenAttributeTestFactory.VALUE).when(service).getValue(any(), any());
 			}
 
 			@Test
 			void shouldCallGetMappedValue() {
 				getPostfachId();
 
-				verify(service).getMappedValue(TokenAttributeTestFactory.asMap(), TokenAttributes.POSTFACH_ID_KEY);
+				verify(service).getValue(TokenAttributeTestFactory.asMap(), TokenAttributes.POSTFACH_ID_KEY);
 			}
 
 			@Test
@@ -691,14 +691,14 @@ class SamlAttributeServiceTest {
 
 		@BeforeEach
 		void init() {
-			doReturn(TokenAttributeTestFactory.VALUE).when(service).getMappedValue(any(), any());
+			doReturn(TokenAttributeTestFactory.VALUE).when(service).getValue(any(), any());
 		}
 
 		@Test
 		void shouldCallGetMappedValue() {
 			getTrustLevel();
 
-			verify(service).getMappedValue(TokenAttributeTestFactory.asMap(), TokenAttributes.TRUST_LEVEL_KEY);
+			verify(service).getValue(TokenAttributeTestFactory.asMap(), TokenAttributes.TRUST_LEVEL_KEY);
 		}
 
 		@Test
@@ -714,7 +714,7 @@ class SamlAttributeServiceTest {
 	}
 
 	@Nested
-	class TestGetMappedValue {
+	class TestGetValue {
 
 		private static final String MAPPED_KEY = UUID.randomUUID().toString();
 
@@ -722,14 +722,14 @@ class SamlAttributeServiceTest {
 		void shouldReturnValueByMappedKey() {
 			when(tokenValidationProperty.getMappings()).thenReturn(Map.of(TokenAttributeTestFactory.NAME, MAPPED_KEY));
 
-			var result = service.getMappedValue(Map.of(MAPPED_KEY, TokenAttributeTestFactory.VALUE), TokenAttributeTestFactory.NAME);
+			var result = service.getValue(Map.of(MAPPED_KEY, TokenAttributeTestFactory.VALUE), TokenAttributeTestFactory.NAME);
 
 			assertThat(result).isEqualTo(TokenAttributeTestFactory.VALUE);
 		}
 
 		@Test
 		void shouldReturnValueByKey() {
-			var result = service.getMappedValue(TokenAttributeTestFactory.asMap(), TokenAttributeTestFactory.NAME);
+			var result = service.getValue(TokenAttributeTestFactory.asMap(), TokenAttributeTestFactory.NAME);
 
 			assertThat(result).isEqualTo(TokenAttributeTestFactory.VALUE);
 		}
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenServiceTest.java b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenServiceTest.java
index 03c85da31396786de3e1f15e8c8cf9c7bf24fd39..06f05f1faf49401696df964d9ee3026c32947ab5 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenServiceTest.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/saml/SamlTokenServiceTest.java
@@ -322,13 +322,6 @@ class SamlTokenServiceTest {
 			verify(service).getTokenIssuer(token);
 		}
 
-		@Test
-		void shouldCallGetValidationService() {
-			getAttributes();
-
-			verify(service).getSamlAttributeService(TOKEN_ISSUER);
-		}
-
 		@Test
 		void shouldCallGetSamlAttributeService() {
 			getAttributes();