diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/kommentar/KommentarMapperTest.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/kommentar/KommentarMapperTest.java
index 90d0a00ca59aaf2cb0f454b18d0cec188d1e31a5..e42ebae9c693e64f9a3433996aa010faa4af44db 100644
--- a/archive-manager-server/src/test/java/de/ozgcloud/archive/kommentar/KommentarMapperTest.java
+++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/kommentar/KommentarMapperTest.java
@@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import java.util.Collection;
 import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -165,21 +164,16 @@ class KommentarMapperTest {
 			void shouldCallAttachmentMapper() {
 				callMapper();
 
-				verify(attachmentMapper).mapAttachments(argThat(this::isCollectionOfAttachmentIds));
+				verify(attachmentMapper).mapAttachments(GrpcKommentarTestFactory.ATTACHMENTS);
 			}
 
 			@Test
 			void shouldMapAllFields() {
-				var kommentar = mapper.mapItemMapToKommentar(GrpcKommentarTestFactory.createItemAsMap());
+				var kommentar = callMapper();
 
 				assertThat(kommentar).usingRecursiveComparison().isEqualTo(KommentarTestFactory.create());
 			}
 
-			@SuppressWarnings("unchecked")
-			private boolean isCollectionOfAttachmentIds(Object obj) {
-				return obj instanceof Collection && ((Collection<String>) obj).containsAll(GrpcKommentarTestFactory.ATTACHMENTS);
-			}
-
 			private Kommentar callMapper() {
 				return mapper.mapItemMapToKommentar(GrpcKommentarTestFactory.createItemAsMap());
 			}