diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormMetaDataTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormMetaDataTestFactory.java
index c003c17865d7ab78877606234db20e2fa11783b9..c3000c2233665de3149f6c98cab76b11b16ff734 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormMetaDataTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/FormMetaDataTestFactory.java
@@ -24,6 +24,8 @@
 package de.ozgcloud.eingang.common.formdata;
 
 import java.time.ZonedDateTime;
+import java.util.Collections;
+import java.util.Map;
 
 public class FormMetaDataTestFactory {
 
@@ -33,6 +35,10 @@ public class FormMetaDataTestFactory {
 	public static final String OE_ID = "010550120100";
 
 	public static FormMetaData create() {
+		return create(Collections.emptyMap());
+	}
+
+	public static FormMetaData create(Map<String, String> entryMap) {
 		return new FormMetaData() {
 
 			@Override
@@ -48,10 +54,12 @@ public class FormMetaDataTestFactory {
 			@Override
 			public String getEntry(String name) {
 				switch (name) {
-				case XTA_IDENTIFIER_ENTRY_NAME:
-					return XTA_IDENTIFIER;
+					case XTA_IDENTIFIER_ENTRY_NAME:
+						return XTA_IDENTIFIER;
+
+					default:
+						return entryMap.get(name);
 				}
-				return null;
 			}
 
 		};