diff --git a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandMapper.java b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandMapper.java
index 8dda404bb1b07280e9260ce41113747407605654..175a6ee53e7480e7df136e9a6672f22e90ab201c 100644
--- a/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandMapper.java
+++ b/archive-manager-server/src/main/java/de/ozgcloud/archive/common/command/CommandMapper.java
@@ -41,10 +41,10 @@ import de.ozgcloud.vorgang.grpc.command.GrpcCommand;
 @AnnotateWith(value = Component.class, elements = @Element(strings = ArchiveManagerConfiguration.COMMAND_MAPPER_NAME))
 interface CommandMapper {
 
-	@Mapping(target = "bodyObject", source = "bodyObj")
 	@Mapping(target = "createdByClientName", ignore = true) // TODO Ergänzen sobald der aktueller Stand das zulässt
-	@Mapping(target = "relationVersion", ignore = true) // TODO Warum fehlt die?
+	@Mapping(target = "relationVersion", ignore = true)
 	@Mapping(target = "body", ignore = true)
+	@Mapping(target = "bodyObject", source = "bodyObj")
 	@Mapping(target = "order", source = "orderString")
 	@Mapping(target = "finishedAt", expression = "java(mapToZonedDateTime(grpcCommand.getFinishedAt()))")
 	ArchiveManagerCommand fromGrpc(GrpcCommand grpcCommand);
diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptorTest.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptorTest.java
index 437490ce8620a3f5af6f6b587fae62e2a7e021ad..76556e7aed494d9ac10c1487da14f71473175364 100644
--- a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptorTest.java
+++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/callcontext/CallContextGrpcServerInterceptorTest.java
@@ -24,6 +24,7 @@
 package de.ozgcloud.archive.common.callcontext;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Optional;
@@ -236,7 +237,4 @@ class CallContextGrpcServerInterceptorTest {
 
 	private record RequestTest() {
 	}
-
-	private record ResponseTest() {
-	}
 }
\ No newline at end of file
diff --git a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java
index c8773687ff2e52d0a0cf1e6840f4b97830be2e17..22fbb411f8155392e181505e828524dbd11181a4 100644
--- a/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java
+++ b/archive-manager-server/src/test/java/de/ozgcloud/archive/common/command/CommandTestFactory.java
@@ -66,8 +66,6 @@ public class CommandTestFactory {
 				.id(ID)
 				.vorgangId(VORGANG_ID)
 				.relationId(RELATION_ID)
-				// TODO Warum fehlt die?
-				// .relationVersion(RELATION_VERSION)
 				.order(ORDER)
 				.status(STATUS)
 				.createdAt(CREATED_AT)