diff --git a/Applications/Tests.cmake b/Applications/Tests.cmake
index 84879e3b44571c62f5ecdfc564e699a874d0cff6..a89ebcf5726201526bbd91faf466b6ef65464a38 100644
--- a/Applications/Tests.cmake
+++ b/Applications/Tests.cmake
@@ -2,4 +2,13 @@
 add_test(NAME ogs_no_args COMMAND ogs)
 set_tests_properties(ogs_no_args PROPERTIES WILL_FAIL TRUE)
 
-AddOgsBenchmark(ogs_empty_project EmptyProject.xml)
+#AddOgsBenchmark(ogs_empty_project EmptyProject.xml)
+#AddOgsBenchmark(ogs_empty_project Elliptic/quad_20x10_GroundWaterFlow.prj)
+
+ExternalData_Add_Test(
+    data
+	NAME reading_GroundWaterFlow_project
+    COMMAND ogs DATA{${ExternalData_SOURCE_ROOT}/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj,quad_20x10_constMat0.mesh.vtu,quad_20x10_left_right.gml}
+)
+
+#AddTest(ogs DATA{${ExternalData_SOURCE_ROOT}/Elliptic/quad_20x10_GroundWaterFlow.prj} TIME)
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5
deleted file mode 100644
index 68ac2e096d661d2c82bcc7280cc19c3ca6755aa6..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.bc.md5
+++ /dev/null
@@ -1 +0,0 @@
-6c5a67ef6572bbe5070fc331b1fc9a69
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5
deleted file mode 100644
index 7d308ccba74a509289b970a0791c8303cda311de..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.cnd.md5
+++ /dev/null
@@ -1 +0,0 @@
-55bfc26fbcf45b779af3d0d688fb83b9
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5
deleted file mode 100644
index 877049f4b96b86a1a4c28f3c2425642833129a00..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gli.md5
+++ /dev/null
@@ -1 +0,0 @@
-e0e57cd16d19acea8a29d4c964dfb924
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5
deleted file mode 100644
index a543c1af91087efe9fe4df1a1795dc397e58d786..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.gml.md5
+++ /dev/null
@@ -1 +0,0 @@
-a054fc73631ae534b814184eb60977c7
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5
deleted file mode 100644
index 9c6e57ad21b81e23e0575d6bc58069b4b5c8d96a..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.ic.md5
+++ /dev/null
@@ -1 +0,0 @@
-28e65510cf287ebd30821075d8e09ca8
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5
deleted file mode 100644
index b4244e260c1a8ea375b3eb8fa2520e915a9d446d..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mfp.md5
+++ /dev/null
@@ -1 +0,0 @@
-29685f8dd61734ead5632b545726758c
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5
deleted file mode 100644
index c7df570ffb08e7944efb5ffff4cfb7465fb1df91..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.mmp.md5
+++ /dev/null
@@ -1 +0,0 @@
-5835b975206ba98627a1b6f1dd6be7af
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5
deleted file mode 100644
index 31884ad24753a0636533fa1503033bf7d5e1c574..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msh.md5
+++ /dev/null
@@ -1 +0,0 @@
-e4c0846e14eeeb1807dd5a52bb98a8ea
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5
deleted file mode 100644
index c8f475148d64a1ecb3fca88b32700af64de72265..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.msp.md5
+++ /dev/null
@@ -1 +0,0 @@
-95ebb6b241466ad0b3c73167755a9b3b
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5
deleted file mode 100644
index 1c4025904aea6d6c72c2a14b194e4a3b04772306..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.num.md5
+++ /dev/null
@@ -1 +0,0 @@
-2116bc15e48e7acabe5ffc3d0c5361fb
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5
deleted file mode 100644
index cb0e363a6bd1bfe25ae8a092ca6bfc33d84520d1..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.out.md5
+++ /dev/null
@@ -1 +0,0 @@
-5964016dd01863a99dac25487287b58a
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5
deleted file mode 100644
index 3cbbb8486ad9e55165a5f2d556e89fe1055bc4fd..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pcs.md5
+++ /dev/null
@@ -1 +0,0 @@
-4eeb3894145d1b4821f23ed9a6d7f238
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5
deleted file mode 100644
index c63313d0e70a350da7b6feaf8b9307b79d953d96..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.pvd.md5
+++ /dev/null
@@ -1 +0,0 @@
-a74b042e3eccb2d4758068a8c289df14
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5
deleted file mode 100644
index c8f475148d64a1ecb3fca88b32700af64de72265..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.rfd.md5
+++ /dev/null
@@ -1 +0,0 @@
-95ebb6b241466ad0b3c73167755a9b3b
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5
deleted file mode 100644
index c8f475148d64a1ecb3fca88b32700af64de72265..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.st.md5
+++ /dev/null
@@ -1 +0,0 @@
-95ebb6b241466ad0b3c73167755a9b3b
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5
deleted file mode 100644
index a7edd5624ca40043ae293a0e613f9247eaf85307..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.tim.md5
+++ /dev/null
@@ -1 +0,0 @@
-d671b92bd9c665a82dc0cdc20da91320
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5
deleted file mode 100644
index d252f598965091c56278b76dfcc6670d87c6fe23..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case.vtu.md5
+++ /dev/null
@@ -1 +0,0 @@
-a615a23368e4cae2d0e794681ba18677
diff --git a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case_expected_result.vtu.md5 b/Tests/Data/Elliptic/2d-quads-x1000-y1000/case_expected_result.vtu.md5
deleted file mode 100644
index d753d6982a58c5c578e95734f36b400e4c3ed5f2..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x1000-y1000/case_expected_result.vtu.md5
+++ /dev/null
@@ -1 +0,0 @@
-9bf2ebcfb38dae40c0a146c34724b463
diff --git a/Tests/Data/Elliptic/2d-quads-x200-y100/case.mcp.md5 b/Tests/Data/Elliptic/2d-quads-x200-y100/case.mcp.md5
deleted file mode 100644
index 34cdc644eb6280dbd9dd6105f1fae823f652e4d2..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x200-y100/case.mcp.md5
+++ /dev/null
@@ -1 +0,0 @@
-def4b0dfb8cd564a290fa534ea567291
diff --git a/Tests/Data/Elliptic/2d-quads-x200-y100/case.msp.md5 b/Tests/Data/Elliptic/2d-quads-x200-y100/case.msp.md5
deleted file mode 100644
index f9b8e0746941383c03a6190c7a6aee93d14641d8..0000000000000000000000000000000000000000
--- a/Tests/Data/Elliptic/2d-quads-x200-y100/case.msp.md5
+++ /dev/null
@@ -1 +0,0 @@
-61c67e135d14f97cf717294aebff0495
diff --git a/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj.md5 b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj.md5
new file mode 100644
index 0000000000000000000000000000000000000000..fbfd7c259f3c80778663668db2bc0637824e21d1
--- /dev/null
+++ b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_GroundWaterFlow.prj.md5
@@ -0,0 +1 @@
+c00fe2789980ff8fc6151db2e5ac8acf
diff --git a/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_constMat0.mesh.vtu.md5 b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_constMat0.mesh.vtu.md5
new file mode 100644
index 0000000000000000000000000000000000000000..63fb272f5cad4f30643a337dd7a9592283885d66
--- /dev/null
+++ b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_constMat0.mesh.vtu.md5
@@ -0,0 +1 @@
+52ee66a799bee3b174e5aaab7660eeae
diff --git a/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_left_right.gml.md5 b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_left_right.gml.md5
new file mode 100644
index 0000000000000000000000000000000000000000..6c6e44e78bcfd97fa791f335c5f4775f5b01552a
--- /dev/null
+++ b/Tests/Data/Elliptic/quad_20x10_GroundWaterFlow/quad_20x10_left_right.gml.md5
@@ -0,0 +1 @@
+07a029d1604f0b2a0b441dbf2a3ed383