diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_l.vtu b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_l.vtu
index cb58ad04d05614ccf2d1d2746181084a5ebe3aac..b476dedcf6a2ef9ce43366cda6a38f6d7c73bb86 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_l.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_l.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76ce4169e50f13f895941306ae82bee084c9791ba3059c91d0fb03fb770b92b6
-size 163986
+oid sha256:c8d929cddd300fa9a7d985615f901398263b7ef473397ffc690b77d0a4daf52f
+size 150751
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_r.vtu b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_r.vtu
index ab17c6615c4713f70e62978f1933892d681d2474..e25de61496b289cf785bbe544783efb0fb6e0388 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_r.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/3D_HGW_1_r.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a789a4ddf8c143059d5874d6b71bd20d5f693af372e709a66a69e03813bee99
-size 163982
+oid sha256:f231aeec27287974a13e1ff06354614c88d27583d9e43cd25233501366fa82f8
+size 150747
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.gml b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.gml
deleted file mode 100644
index 269d0c1e57509fed9a69077d603d4f844462a42b..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e16564c61437cb2b2ed0f60607881672de426db04632ddeed2cedbc62b946134
-size 1309
diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
index 5aae44402a6b2afa5afb5c8ffc7584a59f576664..c21ab1fd638f84d3fd6cbac8fc346356437375af 100644
--- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>3D_HGW_1.vtu</mesh>
-    <geometry>ogs5_H_3d.gml</geometry>
+    <meshes>
+        <mesh>3D_HGW_1.vtu</mesh>
+        <mesh>3D_HGW_1_l.vtu</mesh>
+        <mesh>3D_HGW_1_r.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>hc</name>
@@ -174,14 +177,12 @@
             <initial_condition>c0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>3D_HGW_1_l</mesh>
                     <type>Dirichlet</type>
                     <parameter>c1</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>3D_HGW_1_r</mesh>
                     <type>Dirichlet</type>
                     <parameter>c0</parameter>
                 </boundary_condition>
@@ -194,17 +195,13 @@
             <initial_condition>p_ini</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>geometry</geometrical_set>
-                    <geometry>left</geometry>
                     <type>NonuniformDirichlet</type>
-                    <mesh>3D_HGW_1_l.vtu</mesh>
+                    <mesh>3D_HGW_1_l</mesh>
                     <field_name>p_bc</field_name>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>geometry</geometrical_set>
-                    <geometry>right</geometry>
                     <type>NonuniformDirichlet</type>
-                    <mesh>3D_HGW_1_r.vtu</mesh>
+                    <mesh>3D_HGW_1_r</mesh>
                     <field_name>p_bc</field_name>
                 </boundary_condition>
             </boundary_conditions>