diff --git a/ProcessLib/LiquidFlow/Tests.cmake b/ProcessLib/LiquidFlow/Tests.cmake
index da561dbc015274a5b607211fd3fff32b1e318cb1..c1f831ea4861014ff3f4157a12a0596089242585 100644
--- a/ProcessLib/LiquidFlow/Tests.cmake
+++ b/ProcessLib/LiquidFlow/Tests.cmake
@@ -458,12 +458,7 @@ AddTest(
     # See https://gitlab.opengeosys.org/ogs/ogs/-/merge_requests/3184#note_85104
     REQUIREMENTS NOT OGS_USE_MPI AND NOT COMPILER_IS_APPLE_CLANG
     DIFF_DATA
-    square_5x5_tris_32_right_boundary_ts_0_t_0.000000.xdmf square_5x5_tris_32_right_boundary_ts_0_t_0.000000.xdmf pressure pressure 1e-7 1e-13
-    square_5x5_tris_32_right_boundary_ts_1_t_1.000000.xdmf square_5x5_tris_32_right_boundary_ts_1_t_1.000000.xdmf pressure pressure 1e-7 1e-13
-    square_5x5_tris_32_left_boundary_ts_0_t_0.000000.xdmf square_5x5_tris_32_left_boundary_ts_0_t_0.000000.xdmf pressure pressure 1e-7 1e-13
-    square_5x5_tris_32_left_boundary_ts_1_t_1.000000.xdmf square_5x5_tris_32_left_boundary_ts_1_t_1.000000.xdmf pressure pressure 1e-7 1e-13
-    square_5x5_tris_32_ts_0_t_0.000000.xdmf square_5x5_tris_32_ts_0_t_0.000000.xdmf pressure pressure 1e-7 1e-13
-    square_5x5_tris_32_ts_1_t_1.000000.xdmf square_5x5_tris_32_ts_1_t_1.000000.xdmf pressure pressure 1e-7 1e-13
+    square_5x5_tris_32.xdmf square_5x5_tris_32.xdmf pressure pressure 1e-7 1e-13
 )
 
 #AddTest(
diff --git a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32.h5 b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32.h5
new file mode 100644
index 0000000000000000000000000000000000000000..aefaa77352469809948c83e6fdfe18ccee5dec06
Binary files /dev/null and b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32.h5 differ
diff --git a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32.xdmf b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32.xdmf
new file mode 100644
index 0000000000000000000000000000000000000000..e5efafbe4ce24cc9792bf99584b14e2b1cd225c6
--- /dev/null
+++ b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32.xdmf
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="3.0">
+  <Domain>
+    <Information Name="OGS_VERSION" Value="6.3.3-180-g588fff1347.dirty"/>
+    <Grid CollectionType="Temporal" GridType="Collection" Name="Collection">
+      <Grid Name="Grid">
+        <Time Value="0"/>
+        <Geometry Origin="" Type="XYZ">
+          <DataItem DataType="Float" Dimensions="25 3" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/geometry</DataItem>
+        </Geometry>
+        <Topology Dimensions="128" Type="Mixed">
+          <DataItem DataType="Int" Dimensions="128 1" Format="HDF" Precision="4">square_5x5_tris_32.h5:t_0/topology</DataItem>
+        </Topology>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="HydraulicFlow" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/HydraulicFlow</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="MaterialIDs" Type="None">
+          <DataItem DataType="Int" Dimensions="25 1" Format="HDF" Precision="4">square_5x5_tris_32.h5:t_0/MaterialIDs</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="pressure" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/pressure</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="v" Type="None">
+          <DataItem DataType="Float" Dimensions="25 2" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/v</DataItem>
+        </Attribute>
+      </Grid>
+      <Grid Name="Grid">
+        <Time Value="0"/>
+        <xi:include xpointer="element(/1/1/2/1/2)"/>
+        <xi:include xpointer="element(/1/1/2/1/3)"/>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="HydraulicFlow" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/HydraulicFlow</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="MaterialIDs" Type="None">
+          <DataItem DataType="Int" Dimensions="25 1" Format="HDF" Precision="4">square_5x5_tris_32.h5:t_0/MaterialIDs</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="pressure" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/pressure</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="v" Type="None">
+          <DataItem DataType="Float" Dimensions="25 2" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/v</DataItem>
+        </Attribute>
+      </Grid>
+      <Grid Name="Grid">
+        <Time Value="0"/>
+        <xi:include xpointer="element(/1/1/2/1/2)"/>
+        <xi:include xpointer="element(/1/1/2/1/3)"/>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="HydraulicFlow" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/HydraulicFlow</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="MaterialIDs" Type="None">
+          <DataItem DataType="Int" Dimensions="25 1" Format="HDF" Precision="4">square_5x5_tris_32.h5:t_0/MaterialIDs</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="pressure" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/pressure</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="v" Type="None">
+          <DataItem DataType="Float" Dimensions="25 2" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_0/v</DataItem>
+        </Attribute>
+      </Grid>
+      <Grid Name="Grid">
+        <Time Value="1"/>
+        <xi:include xpointer="element(/1/1/2/1/2)"/>
+        <xi:include xpointer="element(/1/1/2/1/3)"/>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="HydraulicFlow" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/HydraulicFlow</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="MaterialIDs" Type="None">
+          <DataItem DataType="Int" Dimensions="25 1" Format="HDF" Precision="4">square_5x5_tris_32.h5:t_1/MaterialIDs</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="pressure" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/pressure</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="v" Type="None">
+          <DataItem DataType="Float" Dimensions="25 2" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/v</DataItem>
+        </Attribute>
+      </Grid>
+      <Grid Name="Grid">
+        <Time Value="1"/>
+        <xi:include xpointer="element(/1/1/2/1/2)"/>
+        <xi:include xpointer="element(/1/1/2/1/3)"/>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="HydraulicFlow" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/HydraulicFlow</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="MaterialIDs" Type="None">
+          <DataItem DataType="Int" Dimensions="25 1" Format="HDF" Precision="4">square_5x5_tris_32.h5:t_1/MaterialIDs</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="pressure" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/pressure</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="v" Type="None">
+          <DataItem DataType="Float" Dimensions="25 2" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/v</DataItem>
+        </Attribute>
+      </Grid>
+      <Grid Name="Grid">
+        <Time Value="1"/>
+        <xi:include xpointer="element(/1/1/2/1/2)"/>
+        <xi:include xpointer="element(/1/1/2/1/3)"/>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="HydraulicFlow" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/HydraulicFlow</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="MaterialIDs" Type="None">
+          <DataItem DataType="Int" Dimensions="25 1" Format="HDF" Precision="4">square_5x5_tris_32.h5:t_1/MaterialIDs</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="pressure" Type="None">
+          <DataItem DataType="Float" Dimensions="25 1" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/pressure</DataItem>
+        </Attribute>
+        <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="v" Type="None">
+          <DataItem DataType="Float" Dimensions="25 2" Format="HDF" Precision="8">square_5x5_tris_32.h5:t_1/v</DataItem>
+        </Attribute>
+      </Grid>
+    </Grid>
+  </Domain>
+</Xdmf>
diff --git a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_ts_0_t_0.000000.xdmf b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_ts_0_t_0.000000.xdmf
deleted file mode 100644
index 489226749d6631690c1168a744567424c84ac5b6..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_ts_0_t_0.000000.xdmf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="3.0">
-  <Domain>
-    <Grid Name="Grid">
-      <Geometry Origin="" Type="XYZ">
-        <DataItem DataType="Float" Dimensions="25 3" Format="XML" Precision="8">0 0 3 1.25 0 3 2.5 0 3 3.75 0 3 5 0 3 0 1.25 3 1.25 1.25 3 2.5 1.25 3 3.75 1.25 3 5 1.25 3 0 2.5 3 1.25 2.5 3 2.5 2.5 3 3.75 2.5 3 5 2.5 3 0 3.75 3 1.25 3.75 3 2.5 3.75 3 3.75 3.75 3 5 3.75 3 0 5 3 1.25 5 3 2.5 5 3 3.75 5 3 5 5 3</DataItem>
-      </Geometry>
-      <Topology Dimensions="32" Type="Mixed">
-        <DataItem DataType="Int" Dimensions="128" Format="HDF" Precision="8">square_5x5_tris_32_ts_0_t_0.000000.h5:Data7</DataItem>
-      </Topology>
-      <Attribute Center="Grid" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="OGS_VERSION" Type="None">
-        <DataItem DataType="Char" Dimensions="41" Format="XML" Precision="1">54 46 51 46 50 45 53 56 54 45 103 56 102 56 53 56 53 54 49 97 46 100 105 114 116 121 46 50 48 50 48 49 48 50 54 49 51 50 52 51 53</DataItem>
-      </Attribute>
-      <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="HydraulicFlow" Type="None">
-        <DataItem DataType="Float" Dimensions="25" Format="XML" Precision="8">0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0</DataItem>
-      </Attribute>
-      <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="MaterialIDs" Type="None">
-        <DataItem DataType="Int" Dimensions="25" Format="XML" Precision="4">0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0</DataItem>
-      </Attribute>
-      <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="pressure" Type="None">
-        <DataItem DataType="Float" Dimensions="25" Format="XML" Precision="8">3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3</DataItem>
-      </Attribute>
-      <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="v" Type="None">
-        <DataItem DataType="Float" Dimensions="25 2" Format="XML" Precision="8">0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0</DataItem>
-      </Attribute>
-    </Grid>
-  </Domain>
-</Xdmf>
diff --git a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_ts_1_t_1.000000.xdmf b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_ts_1_t_1.000000.xdmf
deleted file mode 100644
index e9a508ac22ff4ffbca83868dde7b34bf96e2a8ca..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/XDMF/square_5x5_tris_32_ts_1_t_1.000000.xdmf
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="3.0">
-  <Domain>
-    <Grid Name="Grid">
-      <Geometry Origin="" Type="XYZ">
-        <DataItem DataType="Float" Dimensions="25 3" Format="XML" Precision="8">0 0 3 1.25 0 3 2.5 0 3 3.75 0 3 5 0 3 0 1.25 3 1.25 1.25 3 2.5 1.25 3 3.75 1.25 3 5 1.25 3 0 2.5 3 1.25 2.5 3 2.5 2.5 3 3.75 2.5 3 5 2.5 3 0 3.75 3 1.25 3.75 3 2.5 3.75 3 3.75 3.75 3 5 3.75 3 0 5 3 1.25 5 3 2.5 5 3 3.75 5 3 5 5 3</DataItem>
-      </Geometry>
-      <Topology Dimensions="32" Type="Mixed">
-        <DataItem DataType="Int" Dimensions="128" Format="HDF" Precision="8">square_5x5_tris_32_ts_1_t_1.000000.h5:Data7</DataItem>
-      </Topology>
-      <Attribute Center="Grid" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="OGS_VERSION" Type="None">
-        <DataItem DataType="Char" Dimensions="41" Format="XML" Precision="1">54 46 51 46 50 45 53 56 54 45 103 56 102 56 53 56 53 54 49 97 46 100 105 114 116 121 46 50 48 50 48 49 48 50 54 49 51 50 52 51 53</DataItem>
-      </Attribute>
-      <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="HydraulicFlow" Type="None">
-        <DataItem DataType="Float" Dimensions="25" Format="XML" Precision="8">-2.8522817198628322e-09 2.8522817198628317e-09 0 4.2784225797942485e-09 -4.2784225797942485e-09 -5.7045634397256652e-09 5.7045634397256635e-09 0 8.5568451595884969e-09 -8.5568451595884969e-09 -5.7045634397256652e-09 5.7045634397256635e-09 0 8.5568451595884969e-09 -8.5568451595884969e-09 -5.7045634397256652e-09 5.7045634397256635e-09 0 8.5568451595884969e-09 -8.5568451595884969e-09 -2.8522817198628322e-09 2.8522817198628317e-09 0 4.2784225797942485e-09 -4.2784225797942485e-09</DataItem>
-      </Attribute>
-      <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="MaterialIDs" Type="None">
-        <DataItem DataType="Int" Dimensions="25" Format="XML" Precision="4">0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0</DataItem>
-      </Attribute>
-      <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="pressure" Type="None">
-        <DataItem DataType="Float" Dimensions="25" Format="XML" Precision="8">1 0.75000000000000011 0.50000000000000067 0.25000000000000044 0 1 0.75000000000000033 0.50000000000000067 0.25000000000000044 0 1 0.75 0.50000000000000067 0.2500000000000005 0 1 0.75000000000000033 0.50000000000000078 0.2500000000000005 0 1 0.75000000000000011 0.50000000000000078 0.2500000000000005 0</DataItem>
-      </Attribute>
-      <Attribute Center="Node" ElementCell="" ElementDegree="0" ElementFamily="" ItemType="" Name="v" Type="None">
-        <DataItem DataType="Float" Dimensions="25 2" Format="XML" Precision="8">5.7045634397256606e-10 -1.7756826847496619e-25 5.7045634397256585e-10 -2.3675769129995494e-25 5.7045634397256668e-10 0 5.7045634397256761e-10 0 5.7045634397256771e-10 0 5.7045634397256616e-10 2.3675769129995494e-25 5.7045634397256596e-10 1.1837884564997749e-25 5.7045634397256637e-10 -8.8784134237483108e-26 5.7045634397256751e-10 -5.9189422824988735e-26 5.7045634397256771e-10 0 5.7045634397256637e-10 -2.3675769129995494e-25 5.7045634397256585e-10 -2.9594711412494396e-26 5.7045634397256616e-10 5.9189422824988746e-26 5.7045634397256751e-10 -5.9189422824988735e-26 5.7045634397256792e-10 -5.9189422824988746e-26 5.7045634397256596e-10 1.1837884564997747e-25 5.7045634397256596e-10 -1.1837884564997742e-25 5.7045634397256637e-10 -1.7756826847496622e-25 5.7045634397256761e-10 -2.9594711412494373e-26 5.7045634397256792e-10 0 5.7045634397256637e-10 0 5.7045634397256585e-10 2.3675769129995494e-25 5.7045634397256596e-10 1.1837884564997749e-25 5.7045634397256751e-10 0 5.7045634397256792e-10 0</DataItem>
-      </Attribute>
-    </Grid>
-  </Domain>
-</Xdmf>