diff --git a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcFileService.java b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcFileService.java
index 173f2e5399b1da9d01572b21d601c9fe9a0333bf..5b4ee354be1b9984831550ae350efdf9c3a7dab1 100644
--- a/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcFileService.java
+++ b/vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/files/GrpcFileService.java
@@ -49,6 +49,7 @@ public class GrpcFileService extends FileServiceImplBase {
 	@Override
 	public void getAttachments(GrpcGetAttachmentsRequest request, StreamObserver<GrpcGetAttachmentsResponse> responseObserver) {
 		var response = service.getAttachments(getVorgangId(request), getEingangId(request));
+
 		responseObserver.onNext(buildAttachmentsResponse(response));
 		responseObserver.onCompleted();
 	}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileITCase.java
index dc81e8ebdf7a0dca0a84f74947e925a78ad8cf67..5b08b661d4e93fc3bee33d86252e4eabd6ee4b70 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileITCase.java
@@ -24,9 +24,10 @@
 package de.ozgcloud.vorgang.files;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import java.util.List;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -36,15 +37,13 @@ import org.mockito.Captor;
 import org.mockito.Mock;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 
 import de.ozgcloud.common.test.DataITCase;
 import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsRequest;
 import de.ozgcloud.vorgang.grpc.file.GrpcGetAttachmentsResponse;
 import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsRequest;
 import de.ozgcloud.vorgang.grpc.file.GrpcGetRepresentationsResponse;
-import de.ozgcloud.vorgang.vorgang.EingangTestFactory;
-import de.ozgcloud.vorgang.vorgang.IncomingFile;
-import de.ozgcloud.vorgang.vorgang.IncomingFileGroupTestFactory;
 import de.ozgcloud.vorgang.vorgang.IncomingFileTestFactory;
 import de.ozgcloud.vorgang.vorgang.Vorgang;
 import de.ozgcloud.vorgang.vorgang.VorgangTestFactory;
@@ -55,25 +54,20 @@ class FileITCase {
 
 	@Autowired
 	private GrpcFileService service;
-
 	@Autowired
 	private MongoOperations mongoOperations;
 
-	private final static FileId ID2 = FileId.createNew();
-
-	private final static List<IncomingFile> TEST_FILES = List.of(IncomingFileTestFactory.create(),
-			IncomingFileTestFactory.createBuilder().id(ID2).build());
+	@MockitoSpyBean
+	private FileService fileService;
 
-	private final Vorgang vorgang = VorgangTestFactory.createBuilder().clearEingangs()
-			.eingang(EingangTestFactory.createBuilder().clearAttachments().clearRepresentations()
-					.attachments(List.of(IncomingFileGroupTestFactory.createBuilder().clearFiles().files(TEST_FILES).build()))
-					.representations(TEST_FILES).build())
-			.build();
+	private final Vorgang vorgang = VorgangTestFactory.create();
 
 	@BeforeEach
 	void init() {
 		mongoOperations.dropCollection(Vorgang.class);
 		mongoOperations.save(vorgang);
+
+		doReturn(Stream.of(OzgCloudFileTestFactory.create(), OzgCloudFileTestFactory.create())).when(fileService).findOzgCloudFiles(any());
 	}
 
 	@Nested
@@ -127,9 +121,9 @@ class FileITCase {
 			void validateSecondAttachmentFileContent() {
 				callServiceGetAttachments();
 
-				var attachment2 = responseCaptor.getValue().getFile(1);
+				var attachment2 = responseCaptor.getValue().getFile(0);
 
-				assertThat(attachment2.getId()).isEqualTo(ID2.toString());
+				assertThat(attachment2.getId()).isEqualTo(OzgCloudFileTestFactory.ID_STR);
 			}
 		}
 
@@ -216,9 +210,9 @@ class FileITCase {
 		void validateSecondRepresentationFileContent() {
 			callServiceGetRepresentations();
 
-			var attachment1 = responseCaptor.getValue().getFile(1);
+			var attachment1 = responseCaptor.getValue().getFile(0);
 
-			assertThat(attachment1.getId()).isEqualTo(ID2.toString());
+			assertThat(attachment1.getId()).isEqualTo(OzgCloudFileTestFactory.ID_STR);
 		}
 
 		private void callServiceGetRepresentations() {