diff --git a/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java b/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
index c50e7b5126ed7c4d12f72e53b53d5b507fb4bd27..699a86d2c63ffa0968bda6347453b94689b3ed3d 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/data/XtaMessageRepositoryTest.java
@@ -1,7 +1,7 @@
 package de.ozgcloud.xta.test.app.data;
 
 import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.*;
-import static de.ozgcloud.xta.test.app.mapper.XtaMessageTestFactory.*;
+import static de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
@@ -18,8 +18,8 @@ import org.mockito.InjectMocks;
 import org.mockito.Spy;
 
 import de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory;
-import de.ozgcloud.xta.test.app.mapper.XtaFileTestFactory;
-import de.ozgcloud.xta.test.app.mapper.XtaMessageTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaFileTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory;
 import de.ozgcloud.xta.test.app.model.Identifier;
 import de.ozgcloud.xta.test.app.model.XtaFile;
 import de.ozgcloud.xta.test.app.model.XtaMessage;
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/PartyTypeTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/PartyTypeTestFactory.java
similarity index 92%
rename from src/test/java/de/ozgcloud/xta/test/app/mapper/PartyTypeTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/PartyTypeTestFactory.java
index f8c968241ce30094436340bd28273c64dfd032dd..78e2af6de1dd58b7c53c3716a3f2e9a3aa8d5942 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/PartyTypeTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/PartyTypeTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.xta.test.app.mapper;
+package de.ozgcloud.xta.test.app.factory;
 
 import static de.ozgcloud.xta.test.app.factory.MessageMetaDataTestFactory.*;
 
diff --git a/src/main/java/de/ozgcloud/xta/test/app/service/XtaCloseRequestTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaCloseRequestTestFactory.java
similarity index 92%
rename from src/main/java/de/ozgcloud/xta/test/app/service/XtaCloseRequestTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/XtaCloseRequestTestFactory.java
index cdb7194c558a1a5f3cc0505e66fd89c5d1a6ba83..01815f032e20f0ed478cd9ddb650a89f4667fcd1 100644
--- a/src/main/java/de/ozgcloud/xta/test/app/service/XtaCloseRequestTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaCloseRequestTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.xta.test.app.service;
+package de.ozgcloud.xta.test.app.factory;
 
 import de.ozgcloud.xta.test.app.model.XtaCloseRequest;
 
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaFileTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaFileTestFactory.java
similarity index 58%
rename from src/test/java/de/ozgcloud/xta/test/app/mapper/XtaFileTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/XtaFileTestFactory.java
index fca7978e6fab2db263bd15d0469dcd64bf391774..0e89e8e12996a1a088aea5c5dc817f3e194010fc 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaFileTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaFileTestFactory.java
@@ -1,21 +1,20 @@
-package de.ozgcloud.xta.test.app.mapper;
+package de.ozgcloud.xta.test.app.factory;
 
 import java.io.File;
 import java.math.BigInteger;
 
 import de.ozgcloud.xta.test.app.model.XtaFile;
-import de.ozgcloud.xta.test.app.service.TempFileTestFactory;
 
 public class XtaFileTestFactory {
-	static final String NAME = "Test_File";
-	static final String XTA_CONTENT = "slkafj3jifsdasx";
-	static final String ZIP_CONTENT_TYPE = "application/zip";
+	public static final String NAME = "Test_File";
+	public static final String XTA_CONTENT = "slkafj3jifsdasx";
+	public static final String ZIP_CONTENT_TYPE = "application/zip";
 
 	public static XtaFile create() {
 		return createBuilder().build();
 	}
 
-	static XtaFile.XtaFileBuilder createBuilder() {
+	public static XtaFile.XtaFileBuilder createBuilder() {
 		File tfile = TempFileTestFactory.createFile(XTA_CONTENT);
 		return XtaFile.builder()
 				.name(NAME)
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaLookupServiceRequestTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaLookupServiceRequestTestFactory.java
similarity index 94%
rename from src/test/java/de/ozgcloud/xta/test/app/mapper/XtaLookupServiceRequestTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/XtaLookupServiceRequestTestFactory.java
index 2c9e28a819325324ef3b0325fecdd9fbf8ed0bf8..1062e28577d0926d6f0aa8ad7ae44d22cfbbee75 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaLookupServiceRequestTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaLookupServiceRequestTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.xta.test.app.mapper;
+package de.ozgcloud.xta.test.app.factory;
 
 import de.ozgcloud.xta.test.app.model.XtaLookupServiceRequest;
 
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaMessageTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaMessageTestFactory.java
similarity index 88%
rename from src/test/java/de/ozgcloud/xta/test/app/mapper/XtaMessageTestFactory.java
rename to src/test/java/de/ozgcloud/xta/test/app/factory/XtaMessageTestFactory.java
index 4033f3ceaf86196b9275391f370e39748db853ed..d1f628163b067b0401b3d5e5394fcc5659640b11 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/XtaMessageTestFactory.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/factory/XtaMessageTestFactory.java
@@ -1,8 +1,7 @@
-package de.ozgcloud.xta.test.app.mapper;
+package de.ozgcloud.xta.test.app.factory;
 
 import java.util.List;
 
-import de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory;
 import de.ozgcloud.xta.test.app.model.XtaMessage;
 
 public class XtaMessageTestFactory {
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/RequestMapperTest.java b/src/test/java/de/ozgcloud/xta/test/app/mapper/RequestMapperTest.java
index 5aedc398cba4170fa89edae7adf8f6e1494217d0..8ecbd17d7efcad160a20c5c97fdc59ba7d3b5e24 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/RequestMapperTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/mapper/RequestMapperTest.java
@@ -23,6 +23,7 @@ import de.ozgcloud.xta.test.app.factory.MessageMetaDataTestFactory;
 import de.ozgcloud.xta.test.app.factory.MsgBoxCloseRequestTypeTestFactory;
 import de.ozgcloud.xta.test.app.factory.MsgBoxFetchRequestTestFactory;
 import de.ozgcloud.xta.test.app.factory.MsgBoxStatusListRequestTypeTestFactory;
+import de.ozgcloud.xta.test.app.factory.PartyTypeTestFactory;
 import de.ozgcloud.xta.test.app.factory.QualifierTypeBusinessScenarioTestFactory;
 import de.ozgcloud.xta.test.app.model.Identifier;
 import de.ozgcloud.xta.test.app.model.XtaCloseRequest;
diff --git a/src/test/java/de/ozgcloud/xta/test/app/mapper/ResponseMapperTest.java b/src/test/java/de/ozgcloud/xta/test/app/mapper/ResponseMapperTest.java
index 2c8c4b1a0998c3251dee33714e3b0b3743032528..d65f05c55f5a616d308d94b1c42588ae7a09629b 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/mapper/ResponseMapperTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/mapper/ResponseMapperTest.java
@@ -6,7 +6,7 @@ import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.MES
 import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.READER_IDENTIFIER;
 import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.*;
 import static de.ozgcloud.xta.test.app.mapper.ResponseMapper.*;
-import static de.ozgcloud.xta.test.app.mapper.XtaLookupServiceRequestTestFactory.*;
+import static de.ozgcloud.xta.test.app.factory.XtaLookupServiceRequestTestFactory.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
@@ -21,7 +21,10 @@ import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 import org.mockito.Mock;
 
+import de.ozgcloud.xta.test.app.factory.XtaFileTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaLookupServiceRequestTestFactory;
 import de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory;
 import de.ozgcloud.xta.test.app.model.XtaFile;
 import de.ozgcloud.xta.test.app.model.XtaMessageMetaDataListing;
 import de.ozgcloud.xta.test.app.util.XtaId;
diff --git a/src/test/java/de/ozgcloud/xta/test/app/service/TempFileTestFactory.java b/src/test/java/de/ozgcloud/xta/test/app/service/TempFileTestFactory.java
deleted file mode 100644
index b2b501432516604b312019f1b79a1029daa69a03..0000000000000000000000000000000000000000
--- a/src/test/java/de/ozgcloud/xta/test/app/service/TempFileTestFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.ozgcloud.xta.test.app.service;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.commons.io.FileUtils;
-
-import lombok.SneakyThrows;
-
-public class TempFileTestFactory {
-
-	@SneakyThrows
-	public static File createFile(String content) {
-		File tFile = File.createTempFile("test", "zip");
-		tFile.deleteOnExit();
-		FileUtils.write(tFile, content, StandardCharsets.UTF_8);
-		return tFile;
-	}
-}
diff --git a/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java b/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
index 2af9db07dfa9ef8b684e3b1a2985c75c70f7cb9b..4841132c2a4e9808882c82b2868cfa322956d7ad 100644
--- a/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
+++ b/src/test/java/de/ozgcloud/xta/test/app/service/XtaMessageServiceTest.java
@@ -1,7 +1,7 @@
 package de.ozgcloud.xta.test.app.service;
 
 import static de.ozgcloud.xta.test.app.factory.XtaMessageMetaDataTestFactory.*;
-import static de.ozgcloud.xta.test.app.mapper.XtaMessageTestFactory.*;
+import static de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
@@ -21,7 +21,8 @@ import org.mockito.Mock;
 import org.mockito.Spy;
 
 import de.ozgcloud.xta.test.app.data.XtaMessageRepository;
-import de.ozgcloud.xta.test.app.mapper.XtaMessageTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaCloseRequestTestFactory;
+import de.ozgcloud.xta.test.app.factory.XtaMessageTestFactory;
 import de.ozgcloud.xta.test.app.model.XtaGetMessageRequest;
 import de.ozgcloud.xta.test.app.model.XtaMessage;
 import de.ozgcloud.xta.test.app.model.XtaMessageMetaDataListing;