diff --git a/ProcessLib/GroundwaterFlow/Tests.cmake b/ProcessLib/GroundwaterFlow/Tests.cmake
index 1851aa743f8e5d7cdae0d7084d3559f2d09eabd9..add27b67b5409c28d8e072748c2912ef633ffb10 100644
--- a/ProcessLib/GroundwaterFlow/Tests.cmake
+++ b/ProcessLib/GroundwaterFlow/Tests.cmake
@@ -264,7 +264,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_surfaceflux.vtu surfaceflux_left_right_dirichlet_reference surfaceflux 1e-15 1e-15
+    cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_surfaceflux_t_1.000000.vtu surfaceflux_left_right_dirichlet_reference surfaceflux 1e-15 1e-15
 )
 AddTest(
     NAME GroundWaterFlowProcess_cube_1x1x1_1e3_neumann_calculatesurfaceflux
@@ -274,7 +274,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_neumann_surfaceflux.vtu surfaceflux_neumann_reference surfaceflux 1e-15 1e-15
+    cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_neumann_surfaceflux_t_1.000000.vtu surfaceflux_neumann_reference surfaceflux 1e-15 1e-15
 )
 AddTest(
     NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_left_right
@@ -284,7 +284,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_surfaceflux.vtu surfaceflux_left_right_reference surfaceflux_left_right 1e-15 1e-15
+    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_surfaceflux_t_1.000000.vtu surfaceflux_left_right_reference surfaceflux_left_right 1e-15 1e-15
 )
 
 AddTest(
@@ -295,7 +295,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_surfaceflux.vtu surfaceflux_front_back_reference surfaceflux_front_back 1e-15 1e-15
+    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_surfaceflux_t_1.000000.vtu surfaceflux_front_back_reference surfaceflux_front_back 1e-15 1e-15
 )
 
 AddTest(
@@ -306,7 +306,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_surfaceflux.vtu surfaceflux_top_bottom_reference surfaceflux_top_bottom 1e-15 1e-15
+    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_surfaceflux_t_1.000000.vtu surfaceflux_top_bottom_reference surfaceflux_top_bottom 1e-15 1e-15
 )
 
 AddTest(
@@ -317,7 +317,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    wedge_1x1x1_1e3_prism_complete_surface.vtu wedge_1x1x1_1e3_prism_complete_surface_surfaceflux.vtu surfaceflux_reference surfaceflux 1e-15 1e-15
+    wedge_1x1x1_1e3_prism_complete_surface.vtu wedge_1x1x1_1e3_prism_complete_surface_surfaceflux_t_1.000000.vtu surfaceflux_reference surfaceflux 1e-15 1e-15
 )
 
 # SQUARE 1x1 GROUNDWATER FLOW TEST -- AXIALLY SYMMETRIC
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
index 9e744cb28432223b463e1b740cebcc351d746fc5..053f4683956a7aa2b2acabf4ee74afbdf45befd3 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>cube_1x1x1_hex_1e3.vtu</mesh>
-    <geometry>cube_1x1x1.gml</geometry>
+    <meshes>
+        <mesh>cube_1x1x1_hex_1e3.vtu</mesh>
+        <mesh>cube_1x1x1_hex_1e3_complete_surface.vtu</mesh>
+        <mesh>cube_1x1x1_hex_1e3_left.vtu</mesh>
+        <mesh>cube_1x1x1_hex_1e3_right.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>GW23</name>
@@ -15,7 +19,7 @@
                 <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
-                <mesh>cube_1x1x1_hex_1e3_complete_surface.vtu</mesh>
+                <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
                 <property_name>surfaceflux</property_name>
                 <output_mesh>cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_surfaceflux.vtu</output_mesh>
             </calculatesurfaceflux>
@@ -79,14 +83,12 @@
             <initial_condition>p0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>cube_1x1x1_hex_1e3_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_left</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>cube_1x1x1_hex_1e3_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_right</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
index 2be69c5d0d7b9f372578a62071266f91eb83294a..c9832a9c6002927bf06a29d06ae7b2220eabd2cc 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>cube_1x1x1_hex_1e3.vtu</mesh>
-    <geometry>cube_1x1x1.gml</geometry>
+    <meshes>
+        <mesh>cube_1x1x1_hex_1e3.vtu</mesh>
+        <mesh>cube_1x1x1_hex_1e3_complete_surface.vtu</mesh>
+        <mesh>cube_1x1x1_hex_1e3_left.vtu</mesh>
+        <mesh>cube_1x1x1_hex_1e3_front.vtu</mesh>
+        <mesh>cube_1x1x1_hex_1e3_right.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>GW23</name>
@@ -15,7 +20,7 @@
                 <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
-                <mesh>cube_1x1x1_hex_1e3_complete_surface.vtu</mesh>
+                <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
                 <property_name>surfaceflux</property_name>
                 <output_mesh>cube_1x1x1_hex_1e3_complete_surface_neumann_surfaceflux.vtu</output_mesh>
             </calculatesurfaceflux>
@@ -79,20 +84,17 @@
             <initial_condition>p0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>cube_1x1x1_hex_1e3_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>front</geometry>
+                    <mesh>cube_1x1x1_hex_1e3_front</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>cube_1x1x1_hex_1e3_right</mesh>
                     <type>Neumann</type>
                     <parameter>p_neumann</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_front.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_front.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..a09b176bd084a00f213a1480494db35aaa3a3782
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_front.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e83eac6906939dd02594c85a2c11ecd475d0400544c964e5d24113dd4e05aa1a
+size 12897
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_left.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_left.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..0c67788fb0ebf2ae70ceb7434487759729ccbb57
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_left.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b76bf4e7791dcd0431554367369cd2c49fd24c6d0784b73d55333667b73d1bc
+size 12897
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_right.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_right.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..cb08cfb5227fb22b26a87ee682d0ba2e5a4f393a
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_right.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efcc5a635b6616ee00d7f8df481c3dfedbab2984a2e5ffb317386095681d19e4
+size 12898
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_back.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_back.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..45490a40f1a43d40be77eb865fffa64419d5dc47
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_back.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:280b1951413ced8698caa3d898034ba22a7b9724020e04ce505aff3754ed6e29
+size 12927
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_bottom.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_bottom.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..45f7210f447e414bfa54591cc272ff64460b3c11
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_bottom.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f07e1a5490472c552091a061397df7a4daecfb3d223004b15a441f6750031f3a
+size 17300
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_front.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_front.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..399c5c761ee4478b061a428e2cbf531b660834ae
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_front.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2daeb24a576a065f9e7bea37bb865fd4f2c6ec3c4c55fb057844929c42241476
+size 12925
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_left.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_left.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..0681a8bfe821a453a6d0eaf0262dcaf88ccd3ffd
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_left.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dc66c5f26bf6aee897d54fa3252655c65370a0791699011382278a3f287cac2
+size 12925
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_right.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_right.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..40237cc2a74ea01a95ddf8a8a9a2ec35f04d0c4b
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_right.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e28cc86cfdbe1469a35b7010040ae14cdc840ba11cad4273240259b3d19a55a4
+size 12926
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_top.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_top.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..2536cab1cc535d63a1e20771eb6fbcde76a50628
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_top.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b603ae3d6f6dd593f42de8ef1980aeee3c72d58d77145e5ff01e2ef5f1c5da8
+size 17308
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
index 226efe240148e119769c591a3e934d8f5ad84315..1dc1368f87ca02578a830b6e9bcd1cc2c11c64e1 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>cube_1x1x1_prism_2e3.vtu</mesh>
-    <geometry>cube_1x1x1.gml</geometry>
+    <meshes>
+        <mesh>cube_1x1x1_prism_2e3.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_complete_surface.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_front.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_back.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>GW23</name>
@@ -15,7 +19,7 @@
                 <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
-                <mesh>cube_1x1x1_prism_2e3_complete_surface.vtu</mesh>
+                <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
                 <property_name>surfaceflux_front_back</property_name>
                 <output_mesh>cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_surfaceflux.vtu</output_mesh>
             </calculatesurfaceflux>
@@ -79,14 +83,12 @@
             <initial_condition>p0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>front</geometry>
+                    <mesh>cube_1x1x1_prism_2e3_front</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_front</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>back</geometry>
+                    <mesh>cube_1x1x1_prism_2e3_back</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_back</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
index 4c87007a4d82170c8db9590c0ab479e013f1e7f0..02a005a4e5bc54d1242169104c720e98dfa83aff 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>cube_1x1x1_prism_2e3.vtu</mesh>
-    <geometry>cube_1x1x1.gml</geometry>
+    <meshes>
+        <mesh>cube_1x1x1_prism_2e3.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_complete_surface.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_left.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_right.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>GW23</name>
@@ -15,7 +19,7 @@
                 <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
-                <mesh>cube_1x1x1_prism_2e3_complete_surface.vtu</mesh>
+                <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
                 <property_name>surfaceflux_left_right</property_name>
                 <output_mesh>cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_surfaceflux.vtu</output_mesh>
             </calculatesurfaceflux>
@@ -79,14 +83,12 @@
             <initial_condition>p0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>cube_1x1x1_prism_2e3_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_left</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>cube_1x1x1_prism_2e3_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_right</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
index 11120050a17aa8ba5f98567bb1389248a4f8ed9a..66237e65e0f5ce2d461fb4edf472bade093c1ac8 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>cube_1x1x1_prism_2e3.vtu</mesh>
-    <geometry>cube_1x1x1.gml</geometry>
+    <meshes>
+        <mesh>cube_1x1x1_prism_2e3.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_complete_surface.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_top.vtu</mesh>
+        <mesh>cube_1x1x1_prism_2e3_bottom.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>GW23</name>
@@ -15,7 +19,7 @@
                 <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
-                <mesh>cube_1x1x1_prism_2e3_complete_surface.vtu</mesh>
+                <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
                 <property_name>surfaceflux_top_bottom</property_name>
                 <output_mesh>cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_surfaceflux.vtu</output_mesh>
             </calculatesurfaceflux>
@@ -79,14 +83,12 @@
             <initial_condition>p0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>top</geometry>
+                    <mesh>cube_1x1x1_prism_2e3_top</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_top</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>cube_1x1x1_geometry</geometrical_set>
-                    <geometry>bottom</geometry>
+                    <mesh>cube_1x1x1_prism_2e3_bottom</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_bottom</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
index 5855385eb3b3ca48b864687df674350de871d505..bb76bc170e01f09d7337c85b0fb326cf1d04eaf7 100644
--- a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
+++ b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>wedge_1x1x1_1e3_prism.vtu</mesh>
-    <geometry>wedge_1x1x1.gml</geometry>
+    <meshes>
+        <mesh>wedge_1x1x1_1e3_prism.vtu</mesh>
+        <mesh>wedge_1x1x1_1e3_prism_complete_surface.vtu</mesh>
+        <mesh>wedge_1x1x1_1e3_prism_left-front-top-bottom.vtu</mesh>
+        <mesh>wedge_1x1x1_1e3_prism_diagonal-left-front--right-back.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>GW23</name>
@@ -15,7 +19,7 @@
                 <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
             </secondary_variables>
             <calculatesurfaceflux>
-                <mesh>wedge_1x1x1_1e3_prism_complete_surface.vtu</mesh>
+                <mesh>wedge_1x1x1_1e3_prism_complete_surface</mesh>
                 <property_name>surfaceflux</property_name>
                 <output_mesh>wedge_1x1x1_1e3_prism_complete_surface_surfaceflux.vtu</output_mesh>
             </calculatesurfaceflux>
@@ -79,14 +83,12 @@
             <initial_condition>p0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>wedge_1x1x1_geometry</geometrical_set>
-                    <geometry>left-front-top-bottom</geometry>
+                    <mesh>wedge_1x1x1_1e3_prism_left-front-top-bottom</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_line</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>wedge_1x1x1_geometry</geometrical_set>
-                    <geometry>diagonal-left-front--right-back</geometry>
+                    <mesh>wedge_1x1x1_1e3_prism_diagonal-left-front--right-back</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_diagonal_surface</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_bottom.vtu b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_bottom.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..172aa244f2b3726576b62d4eedffea2ac3738aa0
--- /dev/null
+++ b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_bottom.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b777b6289ed998cec5a1fb4acb559e641c75db3bfef5dc96d7cab8cfd1edc216
+size 9485
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_diagonal-left-front--right-back.vtu b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_diagonal-left-front--right-back.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..510f9dad1429b811a9f4695a38a9f35ef5b4c287
--- /dev/null
+++ b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_diagonal-left-front--right-back.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b0ce3c94ad069ff7995ff967d1aee7dd6cba69615a28216d47135e66fa0a8db6
+size 12924
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_left-front-top-bottom.vtu b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_left-front-top-bottom.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..25a3f61ac54054756281d61b52ab2c50c117ee1d
--- /dev/null
+++ b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_left-front-top-bottom.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83def72de9eb5f307f9eaa643347a107bc03ef87bdc266e2abdb061f046528a9
+size 2111