diff --git a/Tests/Data/TH2M/HM/flow_fully_saturated.prj b/Tests/Data/TH2M/HM/flow_fully_saturated.prj
index 468b0195e4997215a7a01ea9743f8eb1e05cc449..8be5f2a6d46c333852ae2a4e98a4dc974e1bf79a 100644
--- a/Tests/Data/TH2M/HM/flow_fully_saturated.prj
+++ b/Tests/Data/TH2M/HM/flow_fully_saturated.prj
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>square_1x1_quad8_1e2.vtu</mesh>
-    <geometry>square_1x1.gml</geometry>
+    <meshes>
+        <mesh>square_1x1_quad8_1e2.vtu</mesh>
+        <mesh>square_1x1_quad8_1e2_bottom.vtu</mesh>
+        <mesh>square_1x1_quad8_1e2_left.vtu</mesh>
+        <mesh>square_1x1_quad8_1e2_right.vtu</mesh>
+        <mesh>square_1x1_quad8_1e2_top.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>TH2M</name>
@@ -305,29 +310,25 @@
             <initial_condition>displacement0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_quad8_1e2_left</mesh>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_quad8_1e2_right</mesh>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>bottom</geometry>
+                    <mesh>square_1x1_quad8_1e2_bottom</mesh>
                     <type>Dirichlet</type>
                     <component>1</component>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>top</geometry>
+                    <mesh>square_1x1_quad8_1e2_top</mesh>
                     <type>Dirichlet</type>
                     <component>1</component>
                     <parameter>dirichlet0</parameter>
@@ -341,14 +342,12 @@
             <initial_condition>gas_pressure_ic</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_quad8_1e2_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>gas_pressure_ic</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_quad8_1e2_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>gas_pressure_ic</parameter>
                 </boundary_condition>
@@ -361,14 +360,12 @@
             <initial_condition>capillary_pressure_ic</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_quad8_1e2_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_quad8_1e2_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>dirichlet-1</parameter>
                 </boundary_condition>
@@ -381,14 +378,12 @@
             <initial_condition>temperature_outside</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_quad8_1e2_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>temperature_outside</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_quad8_1e2_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>temperature_outside</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/TH2M/HM/flow_fully_saturated_gas.prj b/Tests/Data/TH2M/HM/flow_fully_saturated_gas.prj
index 99f2b4f89d2aad6df79d3cf614dfbf165a795944..7ef8ba20d14dbdd07995dbb271bf38e099937740 100644
--- a/Tests/Data/TH2M/HM/flow_fully_saturated_gas.prj
+++ b/Tests/Data/TH2M/HM/flow_fully_saturated_gas.prj
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <OpenGeoSysProject>
-    <mesh>square_1x1_quad8_1e2.vtu</mesh>
-    <geometry>square_1x1.gml</geometry>
+    <meshes>
+        <mesh>square_1x1_quad8_1e2.vtu</mesh>
+        <mesh>square_1x1_quad8_1e2_bottom.vtu</mesh>
+        <mesh>square_1x1_quad8_1e2_left.vtu</mesh>
+        <mesh>square_1x1_quad8_1e2_right.vtu</mesh>
+        <mesh>square_1x1_quad8_1e2_top.vtu</mesh>
+    </meshes>
     <processes>
         <process>
             <name>TH2M</name>
@@ -300,29 +305,25 @@
             <initial_condition>displacement0</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_quad8_1e2_left</mesh>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_quad8_1e2_right</mesh>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>bottom</geometry>
+                    <mesh>square_1x1_quad8_1e2_bottom</mesh>
                     <type>Dirichlet</type>
                     <component>1</component>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>top</geometry>
+                    <mesh>square_1x1_quad8_1e2_top</mesh>
                     <type>Dirichlet</type>
                     <component>1</component>
                     <parameter>dirichlet0</parameter>
@@ -336,14 +337,12 @@
             <initial_condition>pressure_ic</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_quad8_1e2_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>dirichlet0</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_quad8_1e2_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>dirichlet1</parameter>
                 </boundary_condition>
@@ -356,14 +355,12 @@
             <initial_condition>pressure_ic</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_quad8_1e2_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>pressure_ic</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_quad8_1e2_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>pressure_ic</parameter>
                 </boundary_condition>
@@ -376,14 +373,12 @@
             <initial_condition>temperature_outside</initial_condition>
             <boundary_conditions>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>left</geometry>
+                    <mesh>square_1x1_quad8_1e2_left</mesh>
                     <type>Dirichlet</type>
                     <parameter>temperature_outside</parameter>
                 </boundary_condition>
                 <boundary_condition>
-                    <geometrical_set>square_1x1_geometry</geometrical_set>
-                    <geometry>right</geometry>
+                    <mesh>square_1x1_quad8_1e2_right</mesh>
                     <type>Dirichlet</type>
                     <parameter>temperature_outside</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/TH2M/HM/square_1x1.gml b/Tests/Data/TH2M/HM/square_1x1.gml
deleted file mode 100644
index d959c7c34c6d9f3fd6e4b7e2c0bb1c774630c77e..0000000000000000000000000000000000000000
--- a/Tests/Data/TH2M/HM/square_1x1.gml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="OpenGeoSysGLI.xsl"?>
-
-<OpenGeoSysGLI xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogs="http://www.opengeosys.org">
-    <name>square_1x1_geometry</name>
-    <points>
-        <point id="0" x="0" y="0" z="0" name="origin"/>
-        <point id="1" x="0" y="1" z="0"/>
-        <point id="2" x="1" y="0" z="0"/>
-        <point id="3" x="1" y="1" z="0"/>
-    </points>
-
-    <polylines>
-        <polyline id="0" name="left">
-            <pnt>0</pnt>
-            <pnt>1</pnt>
-        </polyline>
-        <polyline id="1" name="right">
-            <pnt>2</pnt>
-            <pnt>3</pnt>
-        </polyline>
-        <polyline id="2" name="bottom">
-            <pnt>0</pnt>
-            <pnt>2</pnt>
-        </polyline>
-        <polyline id="3" name="top">
-            <pnt>1</pnt>
-            <pnt>3</pnt>
-        </polyline>
-    </polylines>
-</OpenGeoSysGLI>
diff --git a/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_bottom.vtu b/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_bottom.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..2f6e4f8096c5b72e425cb045c184ce67efe9ea47
--- /dev/null
+++ b/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_bottom.vtu
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
+  <UnstructuredGrid>
+    <Piece NumberOfPoints="21"                   NumberOfCells="10"                  >
+      <PointData>
+        <DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="0"                    RangeMax="139"                  offset="0"                   />
+      </PointData>
+      <CellData>
+        <DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="0"                    RangeMax="9"                    offset="236"                 />
+      </CellData>
+      <Points>
+        <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0"                    RangeMax="1"                    offset="356"                 />
+      </Points>
+      <Cells>
+        <DataArray type="Int64" Name="connectivity" format="appended" RangeMin=""                     RangeMax=""                     offset="1040"                />
+        <DataArray type="Int64" Name="offsets" format="appended" RangeMin=""                     RangeMax=""                     offset="1372"                />
+        <DataArray type="UInt8" Name="types" format="appended" RangeMin=""                     RangeMax=""                     offset="1492"                />
+      </Cells>
+    </Piece>
+  </UnstructuredGrid>
+  <AppendedData encoding="base64">
+   _qAAAAAAAAAAKAAAAAAAAAAgAAAAAAAAAhQAAAAAAAACDAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAHAAAAAAAAAH8AAAAAAAAAhwAAAAAAAAABAAAAAAAAAHkAAAAAAAAAiwAAAAAAAAAFAAAAAAAAAAIAAAAAAAAACQAAAAAAAACBAAAAAAAAAHsAAAAAAAAAiQAAAAAAAAADAAAAAAAAAH0AAAAAAAAABAAAAAAAAAA=UAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAgAAAAAAAAADAAAAAAAAAAQAAAAAAAAABQAAAAAAAAAGAAAAAAAAAAcAAAAAAAAACAAAAAAAAAAJAAAAAAAAAA==+AEAAAAAAAAAAAAAAADwPwAAAAAAAAAAAAAAAAAAAACamZmZmZnpPwAAAAAAAAAAAAAAAAAAAADMzMzMzMzkPwAAAAAAAAAAAAAAAAAAAACamZmZmZnhPwAAAAAAAAAAAAAAAAAAAAAzMzMzMzPjPwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmZmZmZmbmPwAAAAAAAAAAAAAAAAAAAABmZmZmZmbWPwAAAAAAAAAAAAAAAAAAAAAAAAAAAADoPwAAAAAAAAAAAAAAAAAAAACamZmZmZm5PwAAAAAAAAAAAAAAAAAAAACamZmZmZmpPwAAAAAAAAAAAAAAAAAAAABmZmZmZmbuPwAAAAAAAAAAAAAAAAAAAAAAAAAAAADgPwAAAAAAAAAAAAAAAAAAAACamZmZmZnJPwAAAAAAAAAAAAAAAAAAAADNzMzMzMzsPwAAAAAAAAAAAAAAAAAAAADNzMzMzMzcPwAAAAAAAAAAAAAAAAAAAAA0MzMzMzPDPwAAAAAAAAAAAAAAAAAAAAA0MzMzMzPrPwAAAAAAAAAAAAAAAAAAAAAzMzMzMzPTPwAAAAAAAAAAAAAAAAAAAAAAAAAAAADQPwAAAAAAAAAAAAAAAAAAAACamZmZmZnZPwAAAAAAAAAAAAAAAAAAAAA=8AAAAAAAAAAFAAAAAAAAAAkAAAAAAAAACgAAAAAAAAAJAAAAAAAAAA0AAAAAAAAAEAAAAAAAAAANAAAAAAAAABIAAAAAAAAAEwAAAAAAAAASAAAAAAAAABQAAAAAAAAABwAAAAAAAAAUAAAAAAAAAAwAAAAAAAAADwAAAAAAAAAMAAAAAAAAAAQAAAAAAAAAAwAAAAAAAAAEAAAAAAAAAAYAAAAAAAAAAgAAAAAAAAAGAAAAAAAAAAEAAAAAAAAACAAAAAAAAAABAAAAAAAAAA4AAAAAAAAAEQAAAAAAAAAOAAAAAAAAAAAAAAAAAAAACwAAAAAAAAA=UAAAAAAAAAADAAAAAAAAAAYAAAAAAAAACQAAAAAAAAAMAAAAAAAAAA8AAAAAAAAAEgAAAAAAAAAVAAAAAAAAABgAAAAAAAAAGwAAAAAAAAAeAAAAAAAAAA==CgAAAAAAAAAVFRUVFRUVFRUV
+  </AppendedData>
+</VTKFile>
diff --git a/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_left.vtu b/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_left.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..b356d2a60432d2daee33f702c6f0fba9978fe887
--- /dev/null
+++ b/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_left.vtu
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
+  <UnstructuredGrid>
+    <Piece NumberOfPoints="21"                   NumberOfCells="10"                  >
+      <PointData>
+        <DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="0"                    RangeMax="311"                  offset="0"                   />
+      </PointData>
+      <CellData>
+        <DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="0"                    RangeMax="90"                   offset="236"                 />
+      </CellData>
+      <Points>
+        <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0"                    RangeMax="1"                    offset="356"                 />
+      </Points>
+      <Cells>
+        <DataArray type="Int64" Name="connectivity" format="appended" RangeMin=""                     RangeMax=""                     offset="1040"                />
+        <DataArray type="Int64" Name="offsets" format="appended" RangeMin=""                     RangeMax=""                     offset="1372"                />
+        <DataArray type="UInt8" Name="types" format="appended" RangeMin=""                     RangeMax=""                     offset="1492"                />
+      </Cells>
+    </Piece>
+  </UnstructuredGrid>
+  <AppendedData encoding="base64">
+   _qAAAAAAAAAA3AQAAAAAAAGMAAAAAAAAAbgAAAAAAAABYAAAAAAAAAPgAAAAAAAAA4wAAAAAAAABCAAAAAAAAAAAAAAAAAAAADQEAAAAAAAALAAAAAAAAABYAAAAAAAAAIQAAAAAAAAAiAQAAAAAAADcAAAAAAAAATQAAAAAAAAB6AAAAAAAAAI8AAAAAAAAALAAAAAAAAACkAAAAAAAAALkAAAAAAAAAzgAAAAAAAAA=UAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAFAAAAAAAAAAeAAAAAAAAACgAAAAAAAAAMgAAAAAAAAA8AAAAAAAAAEYAAAAAAAAAUAAAAAAAAABaAAAAAAAAAA==+AEAAAAAAAAAAAAAAAAAAGZmZmZmZu4/AAAAAAAAAAAAAAAAAAAAAM3MzMzMzOw/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmek/AAAAAAAAAAAAAAAAAAAAAMzMzMzMzOQ/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmeE/AAAAAAAAAAAAAAAAAAAAADMzMzMzM+M/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOg/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmbk/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmck/AAAAAAAAAAAAAAAAAAAAADMzMzMzM9M/AAAAAAAAAAAAAAAAAAAAADQzMzMzM+s/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAOA/AAAAAAAAAAAAAAAAAAAAAGZmZmZmZuY/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmak/AAAAAAAAAAAAAAAAAAAAADQzMzMzM8M/AAAAAAAAAAAAAAAAAAAAAJqZmZmZmdk/AAAAAAAAAAAAAAAAAAAAAAAAAAAAANA/AAAAAAAAAAAAAAAAAAAAAGZmZmZmZtY/AAAAAAAAAAAAAAAAAAAAAM3MzMzMzNw/AAAAAAAAAAA=8AAAAAAAAAAHAAAAAAAAAAkAAAAAAAAADwAAAAAAAAAJAAAAAAAAAAoAAAAAAAAAEAAAAAAAAAAKAAAAAAAAAAsAAAAAAAAAEgAAAAAAAAALAAAAAAAAABEAAAAAAAAAEwAAAAAAAAARAAAAAAAAAA0AAAAAAAAAFAAAAAAAAAANAAAAAAAAAAYAAAAAAAAABQAAAAAAAAAGAAAAAAAAAA4AAAAAAAAABAAAAAAAAAAOAAAAAAAAAAMAAAAAAAAACAAAAAAAAAADAAAAAAAAAAEAAAAAAAAADAAAAAAAAAABAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAA=UAAAAAAAAAADAAAAAAAAAAYAAAAAAAAACQAAAAAAAAAMAAAAAAAAAA8AAAAAAAAAEgAAAAAAAAAVAAAAAAAAABgAAAAAAAAAGwAAAAAAAAAeAAAAAAAAAA==CgAAAAAAAAAVFRUVFRUVFRUV
+  </AppendedData>
+</VTKFile>
diff --git a/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_right.vtu b/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_right.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..e97b940ad04f7508376b092f8c386a66e3a49a12
--- /dev/null
+++ b/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_right.vtu
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
+  <UnstructuredGrid>
+    <Piece NumberOfPoints="21"                   NumberOfCells="10"                  >
+      <PointData>
+        <DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="10"                   RangeMax="330"                  offset="0"                   />
+      </PointData>
+      <CellData>
+        <DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="9"                    RangeMax="99"                   offset="236"                 />
+      </CellData>
+      <Points>
+        <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="1"                    RangeMax="1.4142135624"         offset="356"                 />
+      </Points>
+      <Cells>
+        <DataArray type="Int64" Name="connectivity" format="appended" RangeMin=""                     RangeMax=""                     offset="1040"                />
+        <DataArray type="Int64" Name="offsets" format="appended" RangeMin=""                     RangeMax=""                     offset="1372"                />
+        <DataArray type="UInt8" Name="types" format="appended" RangeMin=""                     RangeMax=""                     offset="1492"                />
+      </Cells>
+    </Piece>
+  </UnstructuredGrid>
+  <AppendedData encoding="base64">
+   _qAAAAAAAAABKAQAAAAAAADUBAAAAAAAAIAEAAAAAAAB4AAAAAAAAAGIAAAAAAAAAbQAAAAAAAABXAAAAAAAAAPYAAAAAAAAATAAAAAAAAAAKAAAAAAAAAAsBAAAAAAAAIAAAAAAAAAArAAAAAAAAADYAAAAAAAAAzAAAAAAAAAAVAAAAAAAAAI0AAAAAAAAAogAAAAAAAAC3AAAAAAAAAEEAAAAAAAAA4QAAAAAAAAA=UAAAAAAAAAAJAAAAAAAAABMAAAAAAAAAHQAAAAAAAAAnAAAAAAAAADEAAAAAAAAAOwAAAAAAAABFAAAAAAAAAE8AAAAAAAAAWQAAAAAAAABjAAAAAAAAAA==+AEAAAAAAAAAAAAAAADwP2ZmZmZmZu4/AAAAAAAAAAAAAAAAAADwPzQzMzMzM+s/AAAAAAAAAAAAAAAAAADwPwAAAAAAAOg/AAAAAAAAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAAAAAAAAAAAAADwP5qZmZmZmek/AAAAAAAAAAAAAAAAAADwP83MzMzMzOw/AAAAAAAAAAAAAAAAAADwP2ZmZmZmZuY/AAAAAAAAAAAAAAAAAADwP5qZmZmZmeE/AAAAAAAAAAAAAAAAAADwPzMzMzMzM+M/AAAAAAAAAAAAAAAAAADwPwAAAAAAAAAAAAAAAAAAAAAAAAAAAADwP8zMzMzMzOQ/AAAAAAAAAAAAAAAAAADwP5qZmZmZmck/AAAAAAAAAAAAAAAAAADwPzMzMzMzM9M/AAAAAAAAAAAAAAAAAADwP5qZmZmZmdk/AAAAAAAAAAAAAAAAAADwP2ZmZmZmZtY/AAAAAAAAAAAAAAAAAADwP5qZmZmZmbk/AAAAAAAAAAAAAAAAAADwP5qZmZmZmak/AAAAAAAAAAAAAAAAAADwPzQzMzMzM8M/AAAAAAAAAAAAAAAAAADwPwAAAAAAANA/AAAAAAAAAAAAAAAAAADwPwAAAAAAAOA/AAAAAAAAAAAAAAAAAADwP83MzMzMzNw/AAAAAAAAAAA=8AAAAAAAAAAJAAAAAAAAAA8AAAAAAAAAEAAAAAAAAAAPAAAAAAAAAAsAAAAAAAAAEQAAAAAAAAALAAAAAAAAAAwAAAAAAAAAEgAAAAAAAAAMAAAAAAAAAA0AAAAAAAAADgAAAAAAAAANAAAAAAAAABMAAAAAAAAAFAAAAAAAAAATAAAAAAAAAAgAAAAAAAAABwAAAAAAAAAIAAAAAAAAAAYAAAAAAAAACgAAAAAAAAAGAAAAAAAAAAQAAAAAAAAAAgAAAAAAAAAEAAAAAAAAAAUAAAAAAAAAAQAAAAAAAAAFAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAA=UAAAAAAAAAADAAAAAAAAAAYAAAAAAAAACQAAAAAAAAAMAAAAAAAAAA8AAAAAAAAAEgAAAAAAAAAVAAAAAAAAABgAAAAAAAAAGwAAAAAAAAAeAAAAAAAAAA==CgAAAAAAAAAVFRUVFRUVFRUV
+  </AppendedData>
+</VTKFile>
diff --git a/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_top.vtu b/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_top.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..39c3d156d0477b95ac5c7204081eb7c964240915
--- /dev/null
+++ b/Tests/Data/TH2M/HM/square_1x1_quad8_1e2_top.vtu
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64">
+  <UnstructuredGrid>
+    <Piece NumberOfPoints="21"                   NumberOfCells="10"                  >
+      <PointData>
+        <DataArray type="UInt64" Name="bulk_node_ids" format="appended" RangeMin="110"                  RangeMax="340"                  offset="0"                   />
+      </PointData>
+      <CellData>
+        <DataArray type="UInt64" Name="bulk_element_ids" format="appended" RangeMin="90"                   RangeMax="99"                   offset="236"                 />
+      </CellData>
+      <Points>
+        <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="1"                    RangeMax="1.4142135624"         offset="356"                 />
+      </Points>
+      <Cells>
+        <DataArray type="Int64" Name="connectivity" format="appended" RangeMin=""                     RangeMax=""                     offset="1040"                />
+        <DataArray type="Int64" Name="offsets" format="appended" RangeMin=""                     RangeMax=""                     offset="1372"                />
+        <DataArray type="UInt8" Name="types" format="appended" RangeMin=""                     RangeMax=""                     offset="1492"                />
+      </Cells>
+    </Piece>
+  </UnstructuredGrid>
+  <AppendedData encoding="base64">
+   _qAAAAAAAAAB4AAAAAAAAAFMBAAAAAAAAdwAAAAAAAABSAQAAAAAAAHYAAAAAAAAAUQEAAAAAAAB1AAAAAAAAAFABAAAAAAAAdAAAAAAAAABUAQAAAAAAAG4AAAAAAAAAbwAAAAAAAABLAQAAAAAAAHAAAAAAAAAATAEAAAAAAABxAAAAAAAAAE0BAAAAAAAAcgAAAAAAAABOAQAAAAAAAHMAAAAAAAAATwEAAAAAAAA=UAAAAAAAAABaAAAAAAAAAFsAAAAAAAAAXAAAAAAAAABdAAAAAAAAAF4AAAAAAAAAXwAAAAAAAABgAAAAAAAAAGEAAAAAAAAAYgAAAAAAAABjAAAAAAAAAA==+AEAAAAAAAAAAAAAAADwPwAAAAAAAPA/AAAAAAAAAAA0MzMzMzPrPwAAAAAAAPA/AAAAAAAAAADNzMzMzMzsPwAAAAAAAPA/AAAAAAAAAAAAAAAAAADoPwAAAAAAAPA/AAAAAAAAAACamZmZmZnpPwAAAAAAAPA/AAAAAAAAAADMzMzMzMzkPwAAAAAAAPA/AAAAAAAAAABmZmZmZmbmPwAAAAAAAPA/AAAAAAAAAACamZmZmZnhPwAAAAAAAPA/AAAAAAAAAAAzMzMzMzPjPwAAAAAAAPA/AAAAAAAAAABmZmZmZmbuPwAAAAAAAPA/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA/AAAAAAAAAACamZmZmZm5PwAAAAAAAPA/AAAAAAAAAACamZmZmZmpPwAAAAAAAPA/AAAAAAAAAACamZmZmZnJPwAAAAAAAPA/AAAAAAAAAAA0MzMzMzPDPwAAAAAAAPA/AAAAAAAAAAAzMzMzMzPTPwAAAAAAAPA/AAAAAAAAAAAAAAAAAADQPwAAAAAAAPA/AAAAAAAAAACamZmZmZnZPwAAAAAAAPA/AAAAAAAAAABmZmZmZmbWPwAAAAAAAPA/AAAAAAAAAAAAAAAAAADgPwAAAAAAAPA/AAAAAAAAAADNzMzMzMzcPwAAAAAAAPA/AAAAAAAAAAA=8AAAAAAAAAAKAAAAAAAAAAsAAAAAAAAADAAAAAAAAAALAAAAAAAAAA0AAAAAAAAADgAAAAAAAAANAAAAAAAAAA8AAAAAAAAAEAAAAAAAAAAPAAAAAAAAABEAAAAAAAAAEgAAAAAAAAARAAAAAAAAABMAAAAAAAAAFAAAAAAAAAATAAAAAAAAAAgAAAAAAAAABwAAAAAAAAAIAAAAAAAAAAYAAAAAAAAABQAAAAAAAAAGAAAAAAAAAAQAAAAAAAAAAwAAAAAAAAAEAAAAAAAAAAIAAAAAAAAAAQAAAAAAAAACAAAAAAAAAAAAAAAAAAAACQAAAAAAAAA=UAAAAAAAAAADAAAAAAAAAAYAAAAAAAAACQAAAAAAAAAMAAAAAAAAAA8AAAAAAAAAEgAAAAAAAAAVAAAAAAAAABgAAAAAAAAAGwAAAAAAAAAeAAAAAAAAAA==CgAAAAAAAAAVFRUVFRUVFRUV
+  </AppendedData>
+</VTKFile>