diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragITCase.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragITCase.java
index 838f6d5125d5b9bb4be1dfc233113bcd8f7257f7..9d2094d600c3eed7495003e5dfa9ba969a9b4599 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragITCase.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragITCase.java
@@ -1,16 +1,14 @@
 package de.ozgcloud.eingang.semantik.formbased.mantelantrag;
 
-import de.ozgcloud.common.binaryfile.TempFileUtils;
-import de.ozgcloud.common.test.TestUtils;
-import de.ozgcloud.eingang.Application;
-import de.ozgcloud.eingang.common.formdata.FormData;
-import de.ozgcloud.eingang.common.formdata.IncomingFile;
-import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
-import de.ozgcloud.eingang.router.VorgangService;
-import de.ozgcloud.eingang.semantik.SemantikAdapter;
-import de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapterITCase;
-import lombok.SneakyThrows;
-import org.junit.Assert;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -20,14 +18,15 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ActiveProfiles;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.verify;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.test.TestUtils;
+import de.ozgcloud.eingang.Application;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
+import de.ozgcloud.eingang.router.VorgangService;
+import de.ozgcloud.eingang.semantik.SemantikAdapter;
+import de.ozgcloud.eingang.semantik.enginebased.formsolutions.FormSolutionsEngineBasedAdapterITCase;
+import lombok.SneakyThrows;
 
 @ActiveProfiles({ "local", "itcase" })
 @SpringBootTest(classes = Application.class, properties = { "ozgcloud.xta.identifier=afmsh:ozg-cloud-utopia-test" })
@@ -49,25 +48,26 @@ public class MantelantragITCase {
 		ArgumentCaptor<FormData> formDataCaptor;
 
 		@Test
-		public void zustaendigeStelleExists() {
+		void zustaendigeStelleExists() {
 			var formData = prepareTestData();
 			doReturn("test").when(vorgangService).createVorgang(any(FormData.class));
 			semantikAdapter.processFormData(formData);
 
 			verify(vorgangService).createVorgang(formDataCaptor.capture());
 			FormData capturedFormData = formDataCaptor.getValue();
-			Assert.assertNotNull(capturedFormData);
+			assertThat(capturedFormData).isNotNull();
 		}
 
 		@Test
-		public void zustaendigeStelleIsUtopia() {
+		void zustaendigeStelleIsUtopia() {
 			var formData = prepareTestData();
 			doReturn("test").when(vorgangService).createVorgang(any(FormData.class));
 			semantikAdapter.processFormData(formData);
 
 			verify(vorgangService).createVorgang(formDataCaptor.capture());
 			FormData capturedFormData = formDataCaptor.getValue();
-			Assert.assertEquals(capturedFormData.getZustaendigeStelle().getOrganisationseinheitenId(), "123");
+
+			assertThat(capturedFormData.getZustaendigeStelle().getOrganisationseinheitenId()).isEqualTo("123");
 		}
 
 	}
@@ -86,7 +86,7 @@ public class MantelantragITCase {
 				.contentType("application/xml")
 				.build();
 
-		return FormData.builder().representations(Arrays.asList(new IncomingFile[] { xdomeaFile, mantelantragFile })).build();
+		return FormData.builder().representations(List.of(xdomeaFile, mantelantragFile)).build();
 	}
 
 	@SneakyThrows
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
index 123b034740b51c5e735e958238e0d25a7eaf5db6..e04fba257b1d9e65552eabcd78b8e633d329b9a8 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/mantelantrag/MantelantragZustaendigeStelleMapperTest.java
@@ -1,10 +1,14 @@
 package de.ozgcloud.eingang.semantik.formbased.mantelantrag;
 
-import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
-import de.ozgcloud.eingang.common.formdata.FormData;
-import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
-import de.ozgcloud.eingang.common.formdata.FormHeaderTestFactory;
-import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
+import static de.ozgcloud.eingang.semantik.formbased.mantelantrag.MantelantragZustaendigeStelleMapper.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
@@ -18,15 +22,11 @@ import org.mockito.Mock;
 import org.mockito.Spy;
 import org.springframework.core.env.Environment;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import static de.ozgcloud.eingang.semantik.formbased.mantelantrag.MantelantragZustaendigeStelleMapper.*;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Mockito.*;
+import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
+import de.ozgcloud.eingang.common.formdata.FormData;
+import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
+import de.ozgcloud.eingang.common.formdata.FormHeaderTestFactory;
+import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
 
 class MantelantragZustaendigeStelleMapperTest {
 	private final static String TARGET_OEID = "123456";