diff --git a/src/test/java/de/ozgcloud/processor/vorgang/AttachmentTestFactory.java b/src/test/java/de/ozgcloud/processor/vorgang/AttachmentTestFactory.java
index 63fd0fc51baf3dae1545e67f89208098cc5ae5cf..1cff6cf4f730efb28850b862a9a0337d2b185417 100644
--- a/src/test/java/de/ozgcloud/processor/vorgang/AttachmentTestFactory.java
+++ b/src/test/java/de/ozgcloud/processor/vorgang/AttachmentTestFactory.java
@@ -1,13 +1,19 @@
 package de.ozgcloud.processor.vorgang;
 
-import de.ozgcloud.apilib.vorgang.grpc.OzgCloudFileGroupTestFactory;
+import de.ozgcloud.processor.vorgang.FileGroup.FileGroupBuilder;
 
 public class AttachmentTestFactory {
 
-	public static FileGroup createFileGroup() {
+	public static final String GROUP_NAME = "File Group Name";
+
+	public static FileGroup create() {
+		return createBuilder().build();
+	}
+
+	public static FileGroupBuilder createBuilder() {
 		return FileGroup.builder()
-				.name(OzgCloudFileGroupTestFactory.NAME)
-				.file(FileMetaDataTestFactory.create())
-				.build();
+				.name(GROUP_NAME)
+				.file(FileMetaDataTestFactory.create());
 	}
+
 }
diff --git a/src/test/java/de/ozgcloud/processor/vorgang/EingangTestFactory.java b/src/test/java/de/ozgcloud/processor/vorgang/EingangTestFactory.java
index a9762e2b96f54f569f9cf2478392e63232104564..e907c29fbcde654320e9235c36d3dd57cecc3ec1 100644
--- a/src/test/java/de/ozgcloud/processor/vorgang/EingangTestFactory.java
+++ b/src/test/java/de/ozgcloud/processor/vorgang/EingangTestFactory.java
@@ -13,7 +13,7 @@ public class EingangTestFactory {
 	public static Eingang.EingangBuilder createBuilder() {
 		return Eingang.builder()
 				.antragsteller(AntragstellerTestFactory.create())
-				.attachment(AttachmentTestFactory.createFileGroup())
+				.attachment(AttachmentTestFactory.create())
 				.formData(List.<FormDataEntry>of(
 						FormField.builder().name(FIELD_NAME).label(FIELD_LABEL).value(FIELD_VALUE).build(),
 						SubForm.builder().name(SUB_FORM_NAME).label(SUB_FORM_LABEL)