diff --git a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/BoundaryLeft.vtu b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/BoundaryLeft.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..69db22f0cbdea5660c2c11f706f7945dc0d2ce7a
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/BoundaryLeft.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e4ca7979b6a52855f832bd75477792f9f2445327c6ee83bd68d0d43d01985ae
+size 1987
diff --git a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/BoundaryRight.vtu b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/BoundaryRight.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..b7d40347ae21a017d64c9cd457e503c59b17d854
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/BoundaryRight.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4096d8dee5430e7c6c74f734c18e9725902226c812a4282cabbfa1918e7d7fa
+size 2859
diff --git a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.gml b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.gml
deleted file mode 100644
index bf6dd69ac7252a5f0a14ed7ec6c2cbeb86f9395a..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c2b00c5d4deb6e4f8e4780eb72d438abada593e2e0d331e3527e940405f46c0
-size 702
diff --git a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
index 22e5a201b94a0dc8e9a75b421c829f3b47f2ed54..7c309477ce641c52b9744b590ee6bc382e61c2f8 100644
--- a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.prj
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>TracerSimulation.vtu</mesh>
-    <geometry>TracerSimulation.gml</geometry>
+    <meshes>
+        <mesh>TracerSimulation.vtu</mesh>
+        <mesh>BoundaryLeft.vtu</mesh>
+        <mesh>BoundaryRight.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>hc</name>
@@ -233,14 +236,12 @@
             <initial_condition>p0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>BoundaryLeft</mesh>
                     <type>Neumann</type>
                     <parameter>p_Neumann_left</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>BoundaryRight</mesh>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_right</parameter>
                 </boundary_condition>
@@ -253,8 +254,7 @@
             <initial_condition>c0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>BoundaryLeft</mesh>
                     <type>Dirichlet</type>
                     <parameter>c_Dirichlet_left</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.vtu b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.vtu
index 02409115feeee29b9535f9eb6ab8c945d38d9119..b06c3f4304a206c93aca1387ccaee2549eab7851 100644
--- a/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/TracerSimulation/TracerSimulation.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31716dc187cb09943833193e11f056937eec5d839424950ab4874e6f68a74dc7
-size 177539
+oid sha256:67609616a2143ff58312407e4a8f6dff4f9d7454e013206905abfce0e7e8ba29
+size 142779