diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/EingangFilesRepositoryITCase.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/EingangFilesRepositoryITCase.java
index 67cc3be84a678c562158dd6237bf7c95eef5ca3b..8bfba0ec928f92e1a204483e01a9d7ecee706c2f 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/EingangFilesRepositoryITCase.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/EingangFilesRepositoryITCase.java
@@ -129,7 +129,7 @@ class EingangFilesRepositoryITCase {
 								.build())
 						.build());
 
-				var result = repository.findAttachments(vorgang.getId(), Optional.ofNullable(eingangId));
+				var result = repository.findAttachments(vorgang.getId(), Optional.of(eingangId));
 
 				assertThat(result).hasSize(3);
 			}
@@ -210,7 +210,7 @@ class EingangFilesRepositoryITCase {
 				var vorgang = mongoOperations.save(VorgangTestFactory.createBuilder().id(null).version(0L).clearEingangs()
 						.eingang(EingangTestFactory.createBuilder().id(eingangId).representation(IncomingFileTestFactory.create()).build()).build());
 
-				var result = repository.findRepresentations(vorgang.getId(), Optional.ofNullable(eingangId));
+				var result = repository.findRepresentations(vorgang.getId(), Optional.of(eingangId));
 
 				assertThat(result).hasSize(2);
 			}
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
index efe304a37c8bc383c91a22ee1b616cd98a4b56fd..34668b1e6d69728c7379009c5b25e5ac18cef6ac 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
@@ -172,7 +172,7 @@ class FileServiceTest {
 	class TestGetAttachments {
 
 		@Test
-		void shouldCallCheckPermissions() {
+		void shouldCallCheckPermission() {
 			getAttachments();
 
 			verify(policyService).checkPermission(VorgangTestFactory.ID);
@@ -182,7 +182,7 @@ class FileServiceTest {
 		void shouldCallFindAttachments() {
 			getAttachments();
 
-			verify(repository).findAttachments(VorgangTestFactory.ID, Optional.ofNullable(EingangTestFactory.ID));
+			verify(repository).findAttachments(VorgangTestFactory.ID, Optional.of(EingangTestFactory.ID));
 		}
 
 		@Test
@@ -196,7 +196,7 @@ class FileServiceTest {
 		}
 
 		private List<OzgFile> getAttachments() {
-			return service.getAttachments(VorgangTestFactory.ID, Optional.ofNullable(EingangTestFactory.ID));
+			return service.getAttachments(VorgangTestFactory.ID, Optional.of(EingangTestFactory.ID));
 		}
 	}
 
@@ -204,7 +204,7 @@ class FileServiceTest {
 	class TestGetRepresentations {
 
 		@Test
-		void shouldCallCheckPermissions() {
+		void shouldCallCheckPermission() {
 			getRepresentations();
 
 			verify(policyService).checkPermission(VorgangTestFactory.ID);
@@ -214,7 +214,7 @@ class FileServiceTest {
 		void shouldCallFindRepresentations() {
 			getRepresentations();
 
-			verify(repository).findRepresentations(VorgangTestFactory.ID, Optional.ofNullable(EingangTestFactory.ID));
+			verify(repository).findRepresentations(VorgangTestFactory.ID, Optional.of(EingangTestFactory.ID));
 		}
 
 		@Test
@@ -228,7 +228,7 @@ class FileServiceTest {
 		}
 
 		private List<OzgFile> getRepresentations() {
-			return service.getRepresentations(VorgangTestFactory.ID, Optional.ofNullable(EingangTestFactory.ID));
+			return service.getRepresentations(VorgangTestFactory.ID, Optional.of(EingangTestFactory.ID));
 		}
 	}
 }
\ No newline at end of file