diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/control.tsv b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/control.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..e7427b6162e3b597a813a5e4e615cb5f99829389
--- /dev/null
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/control.tsv
@@ -0,0 +1,14 @@
+# Control Parameters
+#! GLOBAL_PROPERTIES_START
+#!   SAMPLE_TYPE = MY_SAMPLE_TYPE
+#!   DATA_SET_TYPE = MY_DATA_SET_TYPE
+#!   USERID = test@test.test
+#! GLOBAL_PROPERTIES_END
+# Data
+S_identifier	S_experiment	S_PROP1	S_PROP2	S_PROP3	D_file_type	D_PROP1	D_PROP2	FOLDER
+/MYSPACE/S1	/MYSPACE/MYPROJ/EXP1	VAL10	VAL20	VAL30	FILE_TYPE	VAL40	VAL50	ds1/
+/MYSPACE/S2	/MYSPACE/MYPROJ/EXP2	VAL11	VAL21	VAL31	FILE_TYPE	VAL41	VAL51	ds2/
+/MYSPACE/S3	/MYSPACE/MYPROJ/EXP3	VAL12	VAL22	VAL32	FILE_TYPE	VAL42	VAL52	ds3/
+
+								
+							
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/control.tsv b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/control.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..ecdd39dda7c59294e29d7e96c7b3ba2f33cd7bb8
--- /dev/null
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/control.tsv
@@ -0,0 +1,11 @@
+# Control Parameters
+#! GLOBAL_PROPERTIES_START
+#!   SAMPLE_TYPE = MY_SAMPLE_TYPE
+#!   DATA_SET_TYPE = MY_DATA_SET_TYPE
+#!   USERID = test@test.test
+#! GLOBAL_PROPERTIES_END
+# Data
+S_identifier	S_experiment	S_PROP1	S_PROP2	S_PROP3	D_file_type	D_PROP1	D_PROP2	FOLDER
+/MYSPACE/S1	/MYSPACE/MYPROJ/EXP1	VAL10	VAL20	VAL30	FILE_TYPE	VAL40	VAL50	ds1/
+	/MYSPACE/MYPROJ/EXP2	VAL11	VAL21	VAL31	FILE_TYPE	VAL41	VAL51	ds2/
+/MYSPACE/S3	/MYSPACE/MYPROJ/EXP3	VAL12	VAL22	VAL32	FILE_TYPE	VAL42	VAL52	ds3/
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/control.tsv b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/control.tsv
new file mode 100644
index 0000000000000000000000000000000000000000..a8d70ccf5927b1d1155673eb9c0f4d2722d2d386
--- /dev/null
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/control.tsv
@@ -0,0 +1,11 @@
+# Control Parameters
+#! GLOBAL_PROPERTIES_START
+#!   SAMPLE_TYPE = MY_SAMPLE_TYPE
+#!   DATA_SET_TYPE = MY_DATA_SET_TYPE
+#!   USERID = test@test.test
+#! GLOBAL_PROPERTIES_END
+# Data
+S_identifier	S_experiment	S_PROP1	S_PROP2	S_PROP3	D_file_type	D_PROP1	D_PROP2	FOLDER
+/MYSPACE/S1	/MYSPACE/MYPROJ/EXP1	VAL10	VAL20	VAL30	FILE_TYPE	VAL40	VAL50	ds1/
+/MYSPACE/S2	/MYSPACE/MYPROJ/EXP2	VAL11	VAL21	VAL31	FILE_TYPE	VAL41	VAL51	ds2/
+/MYSPACE/S3	/MYSPACE/MYPROJ/EXP3	VAL12	VAL22	VAL32	FILE_TYPE	VAL42	VAL52	ds3/
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391