diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
index b33d408f85cce5d4622079f44d3d4204081e6765..4bc7475277d837ba7bbc96fce3321a3c944ad13c 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>square_1x1_quad_1e6.vtu</mesh>
-    <geometry>square_1x1_midpoint.gml</geometry>
+    <meshes>
+        <mesh>square_1x1_quad_1e6.vtu</mesh>
+        <mesh>square_1x1_geometry_middle_point.vtu</mesh>
+        <mesh>square_1x1_geometry_left.vtu</mesh>
+        <mesh>square_1x1_geometry_right.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>GW23</name>
@@ -79,22 +83,19 @@
             <initial_condition>p0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_geometry_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_left</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_geometry_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_right</parameter>
                 </boundary_condition>
             </boundary_conditions>
             <source_terms>
                 <source_term>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>middle_point</geometry>
+                    <mesh>square_1x1_geometry_middle_point</mesh>
                     <type>Nodal</type>
                     <parameter>pressure_source_term</parameter>
                 </source_term>
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_left.vtu b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_left.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..a13635eec703115fcd1cdd8f7e205c09fa3df626
--- /dev/null
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_left.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:738bf064eb885af4ab9d1e8a59489be3b5c2f0e87338b6975ad86548a656976e
+size 87912
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_middle_point.vtu b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_middle_point.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..243f3dc36caf914516c651435afaf1edb5ff9c9f
--- /dev/null
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_middle_point.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dfdb0edd85c31b5007e94245779ec7cdce9f3db606363e5651b829b7df5918b0
+size 1297
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_right.vtu b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_right.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..a89ebce793b0d69b7daa8d421b58cfc5580dc1f8
--- /dev/null
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1x1_geometry_right.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7dc4ea2f8b696874ab4a1437a79479f767cddf736d1e09dd19be207e636b7834
+size 87928