diff --git a/ProcessLib/LiquidFlow/Tests.cmake b/ProcessLib/LiquidFlow/Tests.cmake
index b2afc3a7ad6b70cc0ab6e1cc9b2ed1f034284b53..e3ff8c085c52cb88df8e1fa65fb6e56617970dc7 100644
--- a/ProcessLib/LiquidFlow/Tests.cmake
+++ b/ProcessLib/LiquidFlow/Tests.cmake
@@ -376,12 +376,12 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_0.432000_expected.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_0.432000.vtu specific_flux specific_flux 1e-7 1e-13
-    cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_0.864000_expected.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_0.864000.vtu specific_flux specific_flux 1e-7 1e-13
-    LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_1_t_0.432000.vtu pressure pressure 1e-7 1e-13
-    LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_2_t_0.864000.vtu pressure pressure 1e-7 1e-13
-    LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_1_t_0.432000.vtu HydraulicFlow HydraulicFlow 1e-13 0
-    LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_2_t_0.864000.vtu HydraulicFlow HydraulicFlow 1e-13 0
+    cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_0.432000_expected.vtu LF_cube_1e3_calculatesurfaceflux_cube_1x1x1_hex_1e3_complete_surface_ts_1_t_0.432000.vtu specific_flux specific_flux 1e-7 1e-13
+    cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_0.864000_expected.vtu LF_cube_1e3_calculatesurfaceflux_cube_1x1x1_hex_1e3_complete_surface_ts_2_t_0.864000.vtu specific_flux specific_flux 1e-7 1e-13
+    LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_cube_1e3_calculatesurfaceflux_cube_1x1x1_hex_1e3_ts_1_t_0.432000.vtu pressure pressure 1e-7 1e-13
+    LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_cube_1e3_calculatesurfaceflux_cube_1x1x1_hex_1e3_ts_2_t_0.864000.vtu pressure pressure 1e-7 1e-13
+    LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_cube_1e3_calculatesurfaceflux_cube_1x1x1_hex_1e3_ts_1_t_0.432000.vtu HydraulicFlow HydraulicFlow 1e-13 0
+    LF_cube_1e3_calculatesurfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_cube_1e3_calculatesurfaceflux_cube_1x1x1_hex_1e3_ts_2_t_0.864000.vtu HydraulicFlow HydraulicFlow 1e-13 0
 )
 
 AddTest(
@@ -393,10 +393,11 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cuboid_1x1x1_pyramid_6000_entire_boundary_left_right_dirichlet_specific_flux_t_0.432000_expected.vtu cuboid_1x1x1_pyramid_6000_entire_boundary_left_right_dirichlet_specific_flux_t_0.432000.vtu specific_flux specific_flux 1e-7 1e-13
-    cuboid_1x1x1_pyramid_6000_entire_boundary_left_right_dirichlet_specific_flux_t_0.864000_expected.vtu cuboid_1x1x1_pyramid_6000_entire_boundary_left_right_dirichlet_specific_flux_t_0.864000.vtu specific_flux specific_flux 1e-7 1e-13
-    LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_pcs_0_ts_1_t_0.432000.vtu pressure pressure 1e-7 1e-13
-    LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_pcs_0_ts_2_t_0.864000.vtu pressure pressure 1e-7 1e-13
+    cuboid_1x1x1_pyramid_6000_entire_boundary_left_right_dirichlet_specific_flux_t_0.432000_expected.vtu LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_cuboid_1x1x1_pyramid_6000_entire_boundary_ts_1_t_0.432000.vtu specific_flux specific_flux 1e-7 1e-13
+    cuboid_1x1x1_pyramid_6000_entire_boundary_left_right_dirichlet_specific_flux_t_0.864000_expected.vtu LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_cuboid_1x1x1_pyramid_6000_entire_boundary_ts_2_t_0.864000.vtu specific_flux specific_flux 1e-7 1e-13
+    LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu
+    LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_cuboid_1x1x1_pyramid_6000_ts_1_t_0.432000.vtu pressure pressure 1e-7 1e-13
+    LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_cuboid_1x1x1_pyramid_6000_ts_2_t_0.864000.vtu pressure pressure 1e-7 1e-13
 )
 
 AddTest(
@@ -408,10 +409,10 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    square_1x1_quad_1e1_complete_surface_left_right_dirichlet_specific_flux_t_0.432000_expected.vtu square_1x1_quad_1e1_complete_surface_left_right_dirichlet_specific_flux_t_0.432000.vtu specific_flux specific_flux 1e-7 1e-13
-    square_1x1_quad_1e1_complete_surface_left_right_dirichlet_specific_flux_t_0.864000_expected.vtu square_1x1_quad_1e1_complete_surface_left_right_dirichlet_specific_flux_t_0.864000.vtu specific_flux specific_flux 1e-7 1e-13
-    LF_square_1e1_surfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_square_1e1_surfaceflux_pcs_0_ts_1_t_0.432000.vtu pressure pressure 1e-7 1e-13
-    LF_square_1e1_surfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_square_1e1_surfaceflux_pcs_0_ts_2_t_0.864000.vtu pressure pressure 1e-7 1e-13
+    square_1x1_quad_1e1_complete_surface_left_right_dirichlet_specific_flux_t_0.432000_expected.vtu LF_square_1e1_surfaceflux_square_1x1_quad_1e1_complete_surface_ts_1_t_0.432000.vtu specific_flux specific_flux 1e-7 1e-13
+    square_1x1_quad_1e1_complete_surface_left_right_dirichlet_specific_flux_t_0.864000_expected.vtu LF_square_1e1_surfaceflux_square_1x1_quad_1e1_complete_surface_ts_2_t_0.864000.vtu specific_flux specific_flux 1e-7 1e-13
+    LF_square_1e1_surfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_square_1e1_surfaceflux_square_1x1_quad_1e1_ts_1_t_0.432000.vtu pressure pressure 1e-7 1e-13
+    LF_square_1e1_surfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_square_1e1_surfaceflux_square_1x1_quad_1e1_ts_2_t_0.864000.vtu pressure pressure 1e-7 1e-13
 )
 
 AddTest(
@@ -423,10 +424,10 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    square_1x1_tri_1.8e1_complete_boundary_left_right_dirichlet_specific_flux_t_0.432000_expected.vtu square_1x1_tri_1.8e1_complete_boundary_left_right_dirichlet_specific_flux_t_0.432000.vtu specific_flux specific_flux 1e-7 1e-13
-    square_1x1_tri_1.8e1_complete_boundary_left_right_dirichlet_specific_flux_t_0.864000_expected.vtu square_1x1_tri_1.8e1_complete_boundary_left_right_dirichlet_specific_flux_t_0.864000.vtu specific_flux specific_flux 1e-7 1e-13
-    LF_square_1x1_tri_1.8e1_surfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_square_1x1_tri_1.8e1_surfaceflux_pcs_0_ts_1_t_0.432000.vtu pressure pressure 1e-7 1e-13
-    LF_square_1x1_tri_1.8e1_surfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_square_1x1_tri_1.8e1_surfaceflux_pcs_0_ts_2_t_0.864000.vtu pressure pressure 1e-7 1e-13
+    square_1x1_tri_1.8e1_complete_boundary_left_right_dirichlet_specific_flux_t_0.432000_expected.vtu LF_square_1x1_tri_1.8e1_surfaceflux_square_1x1_tri_1.8e1_complete_boundary_ts_1_t_0.432000.vtu specific_flux specific_flux 1e-7 1e-13
+    square_1x1_tri_1.8e1_complete_boundary_left_right_dirichlet_specific_flux_t_0.864000_expected.vtu LF_square_1x1_tri_1.8e1_surfaceflux_square_1x1_tri_1.8e1_complete_boundary_ts_2_t_0.864000.vtu specific_flux specific_flux 1e-7 1e-13
+    LF_square_1x1_tri_1.8e1_surfaceflux_pcs_0_ts_1_t_0.432000_expected.vtu LF_square_1x1_tri_1.8e1_surfaceflux_square_1x1_tri_1.8e1_ts_1_t_0.432000.vtu pressure pressure 1e-7 1e-13
+    LF_square_1x1_tri_1.8e1_surfaceflux_pcs_0_ts_2_t_0.864000_expected.vtu LF_square_1x1_tri_1.8e1_surfaceflux_square_1x1_tri_1.8e1_ts_2_t_0.864000.vtu pressure pressure 1e-7 1e-13
 )
 
 #AddTest(
diff --git a/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1.8e1_calculatesurfaceflux.prj b/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1.8e1_calculatesurfaceflux.prj
index 669cb8f19331788882862ff805877daf1302f6f0..b4ca4748b101f659c2670d083a9101aad6d166ca 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1.8e1_calculatesurfaceflux.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1.8e1_calculatesurfaceflux.prj
@@ -57,7 +57,8 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>LF_square_1x1_tri_1.8e1_surfaceflux_pcs_{:process_id}</prefix>
+            <prefix>LF_square_1x1_tri_1.8e1_surfaceflux_{:meshname}</prefix>
+            <suffix>_ts_{:timestep}_t_{:time}</suffix>
             <timesteps>
                 <pair>
                     <repeat> 1 </repeat>
@@ -68,7 +69,10 @@
                 <variable> pressure </variable>
                 <variable> v </variable>
             </variables>
-            <suffix>_ts_{:timestep}_t_{:time}</suffix>
+            <meshes>
+                <mesh>square_1x1_tri_1.8e1</mesh>
+                <mesh>square_1x1_tri_1.8e1_complete_boundary</mesh>
+            </meshes>
         </output>
     </time_loop>
     <media>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1e1_calculatesurfaceflux.prj b/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1e1_calculatesurfaceflux.prj
index b548b6e0f28a1b969f4c1eda9667615474c1db67..acbecf9602bded9c596d3719302a9521a3147e11 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1e1_calculatesurfaceflux.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1e1_calculatesurfaceflux.prj
@@ -57,7 +57,8 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>LF_square_1e1_surfaceflux_pcs_{:process_id}</prefix>
+            <prefix>LF_square_1e1_surfaceflux_{:meshname}</prefix>
+            <suffix>_ts_{:timestep}_t_{:time}</suffix>
             <timesteps>
                 <pair>
                     <repeat> 1 </repeat>
@@ -68,7 +69,10 @@
                 <variable> pressure </variable>
                 <variable> v </variable>
             </variables>
-            <suffix>_ts_{:timestep}_t_{:time}</suffix>
+            <meshes>
+                <mesh>square_1x1_quad_1e1</mesh>
+                <mesh>square_1x1_quad_1e1_complete_surface</mesh>
+            </meshes>
         </output>
     </time_loop>
     <media>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Flux/3D/Pyramid/cuboid_1x1x1_pyramid_6000_calculatesurfaceflux.prj b/Tests/Data/Parabolic/LiquidFlow/Flux/3D/Pyramid/cuboid_1x1x1_pyramid_6000_calculatesurfaceflux.prj
index 671a07db5203ccbd1917b9c80d0eb6ab9cb37dba..f67862f06ff1ea22ca0f031f05aff756c8e912d2 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Flux/3D/Pyramid/cuboid_1x1x1_pyramid_6000_calculatesurfaceflux.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Flux/3D/Pyramid/cuboid_1x1x1_pyramid_6000_calculatesurfaceflux.prj
@@ -57,7 +57,8 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_pcs_{:process_id}</prefix>
+            <prefix>LF_cuboid_1x1x1_pyramid_6000_calculatesurfaceflux_{:meshname}</prefix>
+            <suffix>_ts_{:timestep}_t_{:time}</suffix>
             <timesteps>
                 <pair>
                     <repeat> 1 </repeat>
@@ -68,7 +69,10 @@
                 <variable> pressure </variable>
                 <variable> v </variable>
             </variables>
-            <suffix>_ts_{:timestep}_t_{:time}</suffix>
+            <meshes>
+                <mesh>cuboid_1x1x1_pyramid_6000</mesh>
+                <mesh>cuboid_1x1x1_pyramid_6000_entire_boundary</mesh>
+            </meshes>
         </output>
     </time_loop>
     <media>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj b/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj
index 2343fa4d5a3cc81aae2c4b3667fa114cfc647e27..e0254fcf4cce28777566567d900ee25d00c9dc8f 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj
@@ -57,7 +57,8 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>LF_cube_1e3_calculatesurfaceflux_pcs_{:process_id}</prefix>
+            <prefix>LF_cube_1e3_calculatesurfaceflux_{:meshname}</prefix>
+            <suffix>_ts_{:timestep}_t_{:time}</suffix>
             <timesteps>
                 <pair>
                     <repeat> 1 </repeat>
@@ -68,7 +69,10 @@
                 <variable> pressure </variable>
                 <variable> v </variable>
             </variables>
-            <suffix>_ts_{:timestep}_t_{:time}</suffix>
+            <meshes>
+                <mesh>cube_1x1x1_hex_1e3</mesh>
+                <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
+            </meshes>
         </output>
     </time_loop>
     <media>