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 368c51bc64ae6d786f692ea54f203912811a455b..90d0a00ca59aaf2cb0f454b18d0cec188d1e31a5 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
@@ -150,62 +150,8 @@ class KommentarMapperTest {
 
 			@BeforeEach
 			void init() {
-				doReturn(KommentarTestFactory.ID).when(mapper).mapObjectToString(KommentarTestFactory.ID);
-				doReturn(KommentarTestFactory.TEXT).when(mapper).mapObjectToString(KommentarTestFactory.TEXT);
-				doReturn(KommentarTestFactory.CREATED_BY).when(mapper).mapObjectToString(KommentarTestFactory.CREATED_BY);
-				doReturn(KommentarTestFactory.CREATED_AT_STR).when(mapper).mapObjectToString(KommentarTestFactory.CREATED_AT_STR);
-
-				when(timeMapper.parseString(KommentarTestFactory.CREATED_AT_STR)).thenReturn(KommentarTestFactory.CREATED_AT);
-				when(attachmentMapper.mapAttachments(argThat(this::isCollectionOfAttachmentIds))).thenReturn(KommentarTestFactory.ATTACHMENTS);
-			}
-
-			@Test
-			void shouldMapIdToString() {
-				callMapper();
-
-				verify(mapper).mapObjectToString(KommentarTestFactory.ID);
-			}
-
-			@Test
-			void shouldMapId() {
-				var kommentar = callMapper();
-
-				assertThat(kommentar.getId()).isEqualTo(KommentarTestFactory.ID);
-			}
-
-			@Test
-			void shouldMapTextToString() {
-				callMapper();
-
-				verify(mapper).mapObjectToString(KommentarTestFactory.TEXT);
-			}
-
-			@Test
-			void shouldMapText() {
-				var kommentar = callMapper();
-
-				assertThat(kommentar.getText()).isEqualTo(KommentarTestFactory.TEXT);
-			}
-
-			@Test
-			void shouldMapCreatedByToString() {
-				callMapper();
-
-				verify(mapper).mapObjectToString(KommentarTestFactory.CREATED_BY);
-			}
-
-			@Test
-			void shouldMapCreatedBy() {
-				var kommentar = callMapper();
-
-				assertThat(kommentar.getCreatedBy()).isEqualTo(KommentarTestFactory.CREATED_BY);
-			}
-
-			@Test
-			void shouldMapCreatedAtToString() {
-				callMapper();
-
-				verify(mapper).mapObjectToString(KommentarTestFactory.CREATED_AT_STR);
+				when(timeMapper.parseString(any())).thenReturn(KommentarTestFactory.CREATED_AT);
+				when(attachmentMapper.mapAttachments(anyList())).thenReturn(KommentarTestFactory.ATTACHMENTS);
 			}
 
 			@Test
@@ -215,13 +161,6 @@ class KommentarMapperTest {
 				verify(timeMapper).parseString(KommentarTestFactory.CREATED_AT_STR);
 			}
 
-			@Test
-			void shouldMapCreatedAt() {
-				var kommentar = callMapper();
-
-				assertThat(kommentar.getCreatedAt()).isEqualTo(KommentarTestFactory.CREATED_AT);
-			}
-
 			@Test
 			void shouldCallAttachmentMapper() {
 				callMapper();
@@ -230,10 +169,10 @@ class KommentarMapperTest {
 			}
 
 			@Test
-			void shouldMapAttachments() {
-				var kommentar = callMapper();
+			void shouldMapAllFields() {
+				var kommentar = mapper.mapItemMapToKommentar(GrpcKommentarTestFactory.createItemAsMap());
 
-				assertThat(kommentar.getAttachments()).containsExactlyElementsOf(KommentarTestFactory.ATTACHMENTS);
+				assertThat(kommentar).usingRecursiveComparison().isEqualTo(KommentarTestFactory.create());
 			}
 
 			@SuppressWarnings("unchecked")