diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake
index 4b63101058ff0eea09942a2469e74175681e7c76..5b718214f4d139025fbe9d82b90f15530e112175 100644
--- a/ProcessLib/ComponentTransport/Tests.cmake
+++ b/ProcessLib/ComponentTransport/Tests.cmake
@@ -424,7 +424,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_hex_1e3_complete_surface.vtu flux_1e3_t_1.000000.vtu flux flux 1e-10 1e-16
+    cube_1x1x1_hex_1e3_complete_surface_expected_specificflux.vtu flux_1e3_t_1.000000.vtu specific_flux specific_flux 1e-10 1e-16
     cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu concentration Si 1e-10 1e-16
     cube_1x1x1_hex_1e3_left_pcs_0_ts_1_t_1.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_1_t_1.000000.vtu concentration Si 1e-10 1e-16
     cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu pressure pressure 1e-10 1e-16
@@ -444,7 +444,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_hex_1e3_complete_surface.vtu flux_1e3_t_1.000000.vtu flux flux 1e-10 1e-16
+    flux_1e3_t_1.000000.vtu flux_1e3_t_1.000000.vtu specific_flux specific_flux 1e-10 1e-16
     cube_1x1x1_hex_1e3_left_pcs_1_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_left_pcs_1_ts_0_t_0.000000.vtu Si Si 1e-10 1e-16
     cube_1x1x1_hex_1e3_left_pcs_1_ts_1_t_1.000000.vtu cube_1x1x1_hex_1e3_left_pcs_1_ts_1_t_1.000000.vtu Si Si 1e-10 1e-16
     cube_1x1x1_hex_1e3_right_pcs_1_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_right_pcs_1_ts_0_t_0.000000.vtu Si Si 1e-10 1e-16
diff --git a/ProcessLib/GroundwaterFlow/Tests.cmake b/ProcessLib/GroundwaterFlow/Tests.cmake
index 04989e1770cde3daef69be18bc2a8930a3d7e6ca..e6b771e6a7b2a690b742114746090d93bc1e9602 100644
--- a/ProcessLib/GroundwaterFlow/Tests.cmake
+++ b/ProcessLib/GroundwaterFlow/Tests.cmake
@@ -266,7 +266,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_surfaceflux_t_1.000000.vtu surfaceflux_left_right_dirichlet_reference surfaceflux 1e-15 1e-15
+    cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu specific_flux specific_flux 5e-15 5e-15
 )
 AddTest(
     NAME GroundWaterFlowProcess_cube_1x1x1_1e3_neumann_calculatesurfaceflux
@@ -276,7 +276,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_neumann_surfaceflux_t_1.000000.vtu surfaceflux_neumann_reference surfaceflux 1e-15 1e-15
+    cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu specific_flux specific_flux 2e-14 2e-14
 )
 AddTest(
     NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_left_right
@@ -286,7 +286,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_surfaceflux_t_1.000000.vtu surfaceflux_left_right_reference surfaceflux_left_right 1e-15 1e-15
+    cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu specific_flux specific_flux 1e-14 1e-14
 )
 
 AddTest(
@@ -297,7 +297,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_surfaceflux_t_1.000000.vtu surfaceflux_front_back_reference surfaceflux_front_back 1e-15 1e-15
+    cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu specific_flux specific_flux  1e-14 1e-14
 )
 
 AddTest(
@@ -308,7 +308,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_surfaceflux_t_1.000000.vtu surfaceflux_top_bottom_reference surfaceflux_top_bottom 1e-15 1e-15
+    cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu specific_flux specific_flux 1e-14 1e-14
 )
 
 AddTest(
@@ -319,7 +319,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    wedge_1x1x1_1e3_prism_complete_surface.vtu wedge_1x1x1_1e3_prism_complete_surface_surfaceflux_t_1.000000.vtu surfaceflux_reference surfaceflux 1e-15 1e-15
+    wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu specific_flux specific_flux 1e-14 1e-14
 )
 
 # SQUARE 1x1 GROUNDWATER FLOW TEST -- AXIALLY SYMMETRIC
diff --git a/ProcessLib/HT/Tests.cmake b/ProcessLib/HT/Tests.cmake
index d7d15d85083e5798f396e1c2e929027ae13457cf..5c2bd8a965abcd1346422d8c95bdd29500115230 100644
--- a/ProcessLib/HT/Tests.cmake
+++ b/ProcessLib/HT/Tests.cmake
@@ -152,12 +152,12 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    flux_1e3_t_0.000000_expected.vtu flux_1e3_t_0.000000.vtu flux flux 1e-10 1e-16
-    flux_1e3_t_0.000010_expected.vtu flux_1e3_t_0.000010.vtu flux flux 1e-10 1e-16
-    flux_1e3_t_0.001010_expected.vtu flux_1e3_t_0.001010.vtu flux flux 1e-10 1e-16
-    flux_1e3_t_0.101010_expected.vtu flux_1e3_t_0.101010.vtu flux flux 1e-10 1e-16
-    flux_1e3_t_1.101010_expected.vtu flux_1e3_t_1.101010.vtu flux flux 1e-10 1e-16
-    flux_1e3_t_10.000000_expected.vtu flux_1e3_t_10.000000.vtu flux flux 1e-10 1e-16
+    flux_1e3_t_0.000000.vtu flux_1e3_t_0.000000.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e3_t_0.000010.vtu flux_1e3_t_0.000010.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e3_t_0.001010.vtu flux_1e3_t_0.001010.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e3_t_0.101010.vtu flux_1e3_t_0.101010.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e3_t_1.101010.vtu flux_1e3_t_1.101010.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e3_t_10.000000.vtu flux_1e3_t_10.000000.vtu specific_flux specific_flux 1e-10 1e-16
 )
 
 AddTest(
@@ -170,12 +170,12 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    flux_1e4_t_0.000000_expected.vtu flux_1e4_t_0.000000.vtu flux flux 1e-10 1e-16
-    flux_1e4_t_0.000010_expected.vtu flux_1e4_t_0.000010.vtu flux flux 1e-10 1e-16
-    flux_1e4_t_0.001010_expected.vtu flux_1e4_t_0.001010.vtu flux flux 1e-10 1e-16
-    flux_1e4_t_0.101010_expected.vtu flux_1e4_t_0.101010.vtu flux flux 1e-10 1e-16
-    flux_1e4_t_1.101010_expected.vtu flux_1e4_t_1.101010.vtu flux flux 1e-10 1e-16
-    flux_1e4_t_10.000000_expected.vtu flux_1e4_t_10.000000.vtu flux flux 1e-10 1e-16
+    flux_1e4_t_0.000000.vtu flux_1e4_t_0.000000.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e4_t_0.000010.vtu flux_1e4_t_0.000010.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e4_t_0.001010.vtu flux_1e4_t_0.001010.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e4_t_0.101010.vtu flux_1e4_t_0.101010.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e4_t_1.101010.vtu flux_1e4_t_1.101010.vtu specific_flux specific_flux 1e-10 1e-16
+    flux_1e4_t_10.000000.vtu flux_1e4_t_10.000000.vtu specific_flux specific_flux 1e-10 1e-16
 )
 
 # Staggered scheme
diff --git a/ProcessLib/SurfaceFlux/SurfaceFluxData.h b/ProcessLib/SurfaceFlux/SurfaceFluxData.h
index d2f5cdda22662212c21203c3c788d42f38559c97..c5ad39223c89adc607b2f9e7a2486a7004ab4786 100644
--- a/ProcessLib/SurfaceFlux/SurfaceFluxData.h
+++ b/ProcessLib/SurfaceFlux/SurfaceFluxData.h
@@ -41,15 +41,13 @@ struct SurfaceFluxData
           output_mesh_file_name(std::move(surfaceflux_output_mesh_file_name))
     {
         DBUG(
-            "read surfaceflux meta data:\n\tsurfaceflux "
-            "mesh:'%s'\n\tproperty name: "
-            "'%s'\n\toutput to: '%s'",
+            "read surfaceflux meta data:\n\tsurfaceflux mesh:'%s'\n\tproperty "
+            "name: '%s'\n\toutput to: '%s'",
             mesh_name.c_str(), property_vector_name.c_str(),
             output_mesh_file_name.c_str());
     }
 
-    static std::unique_ptr<ProcessLib::SurfaceFluxData>
-    createSurfaceFluxData(
+    static std::unique_ptr<ProcessLib::SurfaceFluxData> createSurfaceFluxData(
         BaseLib::ConfigTree const& calculatesurfaceflux_config,
         std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes,
         std::string const& output_directory)
@@ -68,8 +66,7 @@ struct SurfaceFluxData
 
         if (mesh_name.empty())
         {
-            return std::unique_ptr<ProcessLib::SurfaceFluxData>(
-                nullptr);
+            return nullptr;
         }
         surfaceflux_out_fname = BaseLib::copyPathToFileName(
             surfaceflux_out_fname, output_directory);
diff --git a/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h b/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
index c4e1aa2a7adc3c4364de9a0f17e87fedac0a27ab..93673d46feced68485043207fd4a1798b54fa3d9 100644
--- a/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
+++ b/ProcessLib/SurfaceFlux/SurfaceFluxLocalAssembler.h
@@ -30,7 +30,7 @@ public:
 
     virtual void integrate(std::size_t const element_id,
                            GlobalVector const& x,
-                           MeshLib::PropertyVector<double>& balance,
+                           MeshLib::PropertyVector<double>& specific_flux,
                            double const t,
                            MeshLib::Mesh const& bulk_mesh,
                            std::function<Eigen::Vector3d(
@@ -102,9 +102,9 @@ public:
     /// @param element_id id of the element
     /// @param x The global vector containing the values for numerical
     /// integration.
-    /// @param balance PropertyVector the integration result will be stored
-    /// into, where balance has the same number of entries like mesh elements
-    /// exists.
+    /// @param specific_flux PropertyVector the integration result will be
+    /// stored into, where specific_flux has the same number of entries like
+    /// mesh elements exists.
     /// @param t The integration is performed at the time t.
     /// @param bulk_mesh Stores a reference to the bulk mesh that is needed to
     /// fetch the information for the integration over the surface mesh.
@@ -113,7 +113,7 @@ public:
     /// surface.
     void integrate(std::size_t const element_id,
                    GlobalVector const& x,
-                   MeshLib::PropertyVector<double>& balance,
+                   MeshLib::PropertyVector<double>& specific_flux,
                    double const t,
                    MeshLib::Mesh const& bulk_mesh,
                    std::function<Eigen::Vector3d(
@@ -129,10 +129,12 @@ public:
         // for correct results it is necessary to multiply the normal with -1
         surface_element_normal *= -1;
 
+        double element_area = 0.0;
         std::size_t const n_integration_points =
             _integration_method.getNumberOfPoints();
-        // balance[id_of_element] +=
-        //   int_{\Gamma_e} \alpha \cdot flux \cdot normal \d \Gamma
+        // specific_flux[id_of_element] +=
+        //   int_{\Gamma_e} \alpha \cdot flux \cdot normal \d \Gamma /
+        //   element_area
         for (std::size_t ip(0); ip < n_integration_points; ip++)
         {
             auto const& wp = _integration_method.getWeightedPoint(ip);
@@ -143,20 +145,28 @@ public:
                 getFlux(_bulk_element_id, bulk_element_point, t, x);
 
             for (int component_id(0);
-                 component_id < balance.getNumberOfComponents();
+                 component_id < specific_flux.getNumberOfComponents();
                  ++component_id)
             {
                 // TODO find solution for 2d case
                 double const bulk_grad_times_normal(
                     Eigen::Map<Eigen::RowVectorXd const>(bulk_flux.data(),
-                                                   bulk_flux.size())
+                                                         bulk_flux.size())
                         .dot(Eigen::Map<Eigen::RowVectorXd const>(
                             surface_element_normal.getCoords(), 3)));
 
-                balance.getComponent(element_id, component_id) +=
+                specific_flux.getComponent(element_id, component_id) +=
                     bulk_grad_times_normal * _detJ_times_integralMeasure[ip] *
                     wp.getWeight();
             }
+            element_area += _detJ_times_integralMeasure[ip] * wp.getWeight();
+        }
+        for (int component_id(0);
+             component_id < specific_flux.getNumberOfComponents();
+             ++component_id)
+        {
+            specific_flux.getComponent(element_id, component_id) /=
+                element_area;
         }
     }
 
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
index 12f4ae0ee9d4d600c6a587812288dbc20dfd0310..a8e9d85105eac77b7a39beec1fb052379cd1a269 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_calculatesurfaceflux.prj
@@ -20,8 +20,8 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
-                <property_name>surfaceflux</property_name>
-                <output_mesh>cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_surfaceflux.vtu</output_mesh>
+                <property_name>specific_flux</property_name>
+                <output_mesh>cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
index 8b744c41e005214ac88d077db7267bf1b22fc2b3..d8b3187e18f9d4c128c763c20a21a53fd4226437 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1e3_neumann_calculatesurfaceflux.prj
@@ -21,8 +21,8 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
-                <property_name>surfaceflux</property_name>
-                <output_mesh>cube_1x1x1_hex_1e3_complete_surface_neumann_surfaceflux.vtu</output_mesh>
+                <property_name>specific_flux</property_name>
+                <output_mesh>cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface.vtu
index 44e59b0b5809a0e98c1d6b6a0beaff5e02891183..303a9f426e18ba598faa5a55f8538f6f5d306b24 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface.vtu
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8f567f4e6e43a6c00d914365e71a8c040113928495cd761e85de71c490adcd3
-size 19370
+oid sha256:4f405c070ea2cab30321345825eff7421fb1a5401cc2887a68da26e4e04d0b70
+size 65673
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..cb0b6c34e3f237a4b56330fa0c806780938a9856
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ae8b3a575d4db0e2efa4b16390debfb128db4eab2848924d1468aee28abd7a0
+size 79174
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..18a4d851811ae9db4f6147ebe7751d04d58accc6
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_hex_1e3_complete_surface_neumann_specific_flux_t_1.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85c8170aaf6ed065dd2f9b22a79c214a105b3fdd00d6a7d644c188bf072e01bf
+size 79197
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface.vtu
index ffbc17aee85bc7201a56bd4414cb2bc1aabf849e..a7a7372bd6514ac3d09723d831d6a567fae9dc8d 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface.vtu
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b862616772808a68e78842d449373d86bf8368ac72ca36be740a2fa2ffca3f02
-size 25251
+oid sha256:8262bb7cd535c9a7f3e61dbc44d87fc0eba71e81a457d1f09c55fd41c4246b6b
+size 77073
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..10f0c8dc143a41202fd646bf7c41f1986d4be392
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux_t_1.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb8c712d9fc13811f816b8ea753e0c648baf14db64c689a4abfcde7a84020c65
+size 92231
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..1ca1c95b4bc62df60b6d900712826cdbff40fa23
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux_t_1.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:beddcbe6cad4a33dba53320f8e0260465ac0e0bf688ab5b936fe46aaed9edeab
+size 92231
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..2eaf3c35c680978e8d7c6679b6469293d3964e69
--- /dev/null
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux_t_1.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32b8e8d42bb6e8eaab9ffae3dc5706d39fbc7e8a3740af446895c2911f6a6091
+size 92231
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
index 7b7574bb4dfa57b97788e98b9b9dae08f4b9b797..d7287b9e12a3879f04e8906f48702476174ae1d4 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_front_back.prj
@@ -20,8 +20,8 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
-                <property_name>surfaceflux_front_back</property_name>
-                <output_mesh>cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_surfaceflux.vtu</output_mesh>
+                <property_name>specific_flux</property_name>
+                <output_mesh>cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_specific_flux.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
index cc0f91ae57113431eeef7d7305e8f27af834af63..a039b967555693dca05fde68c3f6b6d142a17ce6 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_left_right.prj
@@ -20,8 +20,8 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
-                <property_name>surfaceflux_left_right</property_name>
-                <output_mesh>cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_surfaceflux.vtu</output_mesh>
+                <property_name>specific_flux</property_name>
+                <output_mesh>cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_specific_flux.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
index a42fc5b418884779045423a145c5487245df1088..e8cf58a967a967359906fcd9b462c32782bdf1d6 100644
--- a/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
+++ b/Tests/Data/Elliptic/cube_1x1x1_GroundWaterFlow/cube_2e3_prism_surfaceflux_top_bottom.prj
@@ -20,8 +20,8 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_prism_2e3_complete_surface</mesh>
-                <property_name>surfaceflux_top_bottom</property_name>
-                <output_mesh>cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_surfaceflux.vtu</output_mesh>
+                <property_name>specific_flux</property_name>
+                <output_mesh>cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_specific_flux.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
index 12638cfb52235fa984baf88c2d41b6e25ceb3bb2..c4545c06bee786d430d71faf0eb283aaf798105b 100644
--- a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
+++ b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1e3_prism_surfaceflux_diagonal.prj
@@ -20,8 +20,8 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>wedge_1x1x1_1e3_prism_complete_surface</mesh>
-                <property_name>surfaceflux</property_name>
-                <output_mesh>wedge_1x1x1_1e3_prism_complete_surface_surfaceflux.vtu</output_mesh>
+                <property_name>specific_flux</property_name>
+                <output_mesh>wedge_1x1x1_1e3_prism_complete_surface_specific_flux.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
     </processes>
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface.vtu b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface.vtu
index c9740be56162943a2c386cd6e30dd4dcfb7686a7..cdf0c5bbcf87425311fc32e69ad98e0c1c0a3dab 100644
--- a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface.vtu
+++ b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da1bab5a81c4cec75d25f888ffeab2625c5b791554cf9986b8c47f95e96b0e84
-size 14507
+oid sha256:33240451142592538feba6d4067376ffbe8032eefc12b09e1fdf08d92210a71a
+size 50373
diff --git a/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..91bd752976b23a81d3c878d068fc7c3cbe402328
--- /dev/null
+++ b/Tests/Data/Elliptic/wedge_1x1x1_GroundWaterFlow/wedge_1x1x1_1e3_prism_complete_surface_specific_flux_t_1.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87d222dbc647c32e2581b445def90d9040f9842693f3bd56097dc69b7ea4bcb0
+size 59856
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface.vtu b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface.vtu
index 8a2407e5f3183a2091ee355e342e9c8ab505e457..746af9e84c5fa288a9e2ffa1b5459a596d8a6245 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcb45ed892b69e6ddf23038d5d6dbe292a2f95448b97e6401336bbdb4f8982e5
-size 79181
+oid sha256:a8aca78e405ba26bf62f88d8cf2e2397f19c1e4b67fb3139740a56a339772c97
+size 55733
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface_expected_specificflux.vtu b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface_expected_specificflux.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..ef1238b492435e333a8cbee35a918de30aec31f7
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface_expected_specificflux.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3775977da46271bfc3c66e43bc3d92886d124f1ba03f8754bc47e06622410998
+size 60730
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
index 822958182eea598d250d12b775b95c2d8224a882..7db27ab28dd8e7a4dc18044e8beed2e9aade0c06 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
@@ -52,7 +52,7 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
-                <property_name>flux</property_name>
+                <property_name>specific_flux</property_name>
                 <output_mesh>flux_1e3.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/cube_1x1x1_hex_1e3_complete_surface.vtu b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/cube_1x1x1_hex_1e3_complete_surface.vtu
index 8a2407e5f3183a2091ee355e342e9c8ab505e457..746af9e84c5fa288a9e2ffa1b5459a596d8a6245 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/cube_1x1x1_hex_1e3_complete_surface.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/cube_1x1x1_hex_1e3_complete_surface.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcb45ed892b69e6ddf23038d5d6dbe292a2f95448b97e6401336bbdb4f8982e5
-size 79181
+oid sha256:a8aca78e405ba26bf62f88d8cf2e2397f19c1e4b67fb3139740a56a339772c97
+size 55733
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/flux_1e3_t_1.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/flux_1e3_t_1.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..8311a3dfcd38a16e96171f4ede45aa31d16ab9de
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/flux_1e3_t_1.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b82fdf0de57a233277e5f3c61adac80b6c888df790aba08535722f763597e209
+size 79190
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
index 67ac3b35fdd38cc546306115593d01279c57f888..9629f7be175cc8299f7aa0d52e7f97a0cf3b6f4c 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
@@ -53,7 +53,7 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
-                <property_name>flux</property_name>
+                <property_name>specific_flux</property_name>
                 <output_mesh>flux_1e3.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
index 9e67686fdb2fe7879a88946ea580cae43f474763..92db74ba433cbfb8a37c0f96aff08187644772c3 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
@@ -61,7 +61,7 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e3_complete_surface</mesh>
-                <property_name>flux</property_name>
+                <property_name>specific_flux</property_name>
                 <output_mesh>flux_1e3.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
index bbf45b9cbfe9bc68fd94bd502aeb46394b507b30..6b7ed2d017508e729911cc9e04212d751e3b5b35 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
@@ -61,7 +61,7 @@
             </secondary_variables>
             <calculatesurfaceflux>
                 <mesh>cube_1x1x1_hex_1e4_complete_surface</mesh>
-                <property_name>flux</property_name>
+                <property_name>specific_flux</property_name>
                 <output_mesh>flux_1e4.vtu</output_mesh>
             </calculatesurfaceflux>
         </process>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface.vtu
index 44e59b0b5809a0e98c1d6b6a0beaff5e02891183..303a9f426e18ba598faa5a55f8538f6f5d306b24 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface.vtu
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/cube_1x1x1_hex_1e3_complete_surface.vtu
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8f567f4e6e43a6c00d914365e71a8c040113928495cd761e85de71c490adcd3
-size 19370
+oid sha256:4f405c070ea2cab30321345825eff7421fb1a5401cc2887a68da26e4e04d0b70
+size 65673
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000000.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..1709283fe338f353d5a7e3e9d16fd15380fc96c3
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab85345c4805d8401a66985b0847400fa43485612144dbc7d43f82cbd0cb6b9a
+size 79182
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000000_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000000_expected.vtu
deleted file mode 100644
index 302227c95a92292f8e759071b0f8f1e454c3117a..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1d4caf0f6f1969ca7b11c75da71d81ae25b1eb1ef2467e3c04dbb397a2c71e21
-size 92329
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000010.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..fe6853f9cb9fb572fbbfd6210bc5f7a613e403cb
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000010.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b2261b24061b63a90e3a5b94f98742516c47b4333f509de6218a595c17f9c3f
+size 79182
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000010_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000010_expected.vtu
deleted file mode 100644
index 920be016479263b5fc67ba0c758b4378d133ccf7..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.000010_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:472e73de2432a97a884201ae9b64e25a34931a483f9f75b3a9b40128834bf0db
-size 92329
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.001010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.001010.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..7e75e457e83db85a6b2147f911f5f4115d945d35
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.001010.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48fb970c4caaeeb9a1ab85fc88a1269ada095b3788788d86505291c9cb0d4171
+size 79182
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.001010_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.001010_expected.vtu
deleted file mode 100644
index 7f6fe3c9d9fe56ef0f868013e11519687e230ecc..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.001010_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:08bb158c0cc577b05cf5ea2884370ee67b132e37f8004156e3f9fd5d4bf376fe
-size 92329
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.101010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.101010.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..99ce3292db7e4fba095a0c03ac12e64d89b5d2d9
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.101010.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:218ee28b97578ad2f65ece019f0e42684229adce9e39ef65dc4fd28d4d6ab998
+size 79182
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.101010_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.101010_expected.vtu
deleted file mode 100644
index 79ac4d879dcc68d928097aa5e7916834875153a4..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_0.101010_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01507b460558c41abf0273bccb5509eeb54f5994fc6b2e3cc7506313fbd82f0e
-size 92329
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_1.101010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_1.101010.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..cf9abf78a9b2c51a3211a5dbd8c8f0bbaa754b39
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_1.101010.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08d598c55d0a9979517c825932acbac46ffbb0e9a58ca0955887f471bb465a2c
+size 79182
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_1.101010_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_1.101010_expected.vtu
deleted file mode 100644
index 307407a690f9ccd7d6ef31e606c5ad37f14789b9..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_1.101010_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3c8da84e1a05dbfba964def4c017a2d29aea3c0223279e6f14624b4f5472ff74
-size 92329
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_10.000000.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_10.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..92d97e7672b7ec9c263189e8d3fb50a7723a1f2a
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_10.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:178a4c72ed72a21365694b95ec19d91877fecf7e3251cd99b0c2a44b26e25500
+size 79182
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_10.000000_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_10.000000_expected.vtu
deleted file mode 100644
index 8124dcf406d6d9dd43a2d164a015d30c345d17bb..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e3_t_10.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a15b71f0070d9244376bbb773da83aa59670efaeac1bbe454c9d93dd7c3af24
-size 92329
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000000.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..1a28d28f4335e59eacf21c5b0710d34cd05f68c9
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16551373d4404557c1380ae254ed01a3a22a4fcb5c233388e688d73e0cdbf737
+size 377195
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000000_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000000_expected.vtu
deleted file mode 100644
index 1688ccf677ecace11c8fa657f3f6e42ca77a80ba..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a75912e813d2bb64404931b712b03f96cbd441082529a9f967f3d65f03802aa6
-size 377185
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000010.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..15ae43584a0d1ba4e392897e1998e78122ff8096
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000010.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0454dbe713ceace76289208874098d2490732a9a651c659d2b1c21e4b0e53873
+size 377195
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000010_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000010_expected.vtu
deleted file mode 100644
index be50486b1bd3fceec6456d6a62cd04b3b00dc996..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.000010_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a9a592901b333e3f32c4c96c89b7ca53783de6fab04d4e7938e17369b9c2b27
-size 377186
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.001010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.001010.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..7cd28dddcf94b3db46c8d4e0f0d9a37633b69aae
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.001010.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb60b45c2dcdb542652c8dd0e88d854ca344a86a595efe740d6cad844cd646ce
+size 377195
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.001010_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.001010_expected.vtu
deleted file mode 100644
index 1049c504d1705d7b035c1b95623e5ef33bc080b6..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.001010_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b35756b997899cc53f4827bebc06e9f4d0df48f36d778fc599d955f8f9a480e
-size 377186
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.101010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.101010.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..f31341273c5c91a1d620103e251036ddbca9a174
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.101010.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6d051472a5bdbeff63328d6792fc9531cf1f06857b5f13199a2dee2d9d43ca2
+size 377195
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.101010_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.101010_expected.vtu
deleted file mode 100644
index 7eb41b10fec9047f21a0e200e3c3ab4b09577e36..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_0.101010_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0beb0f63af264abfe500176bc8f197b052abb2f6c54c9a81f687f674121bd5f0
-size 377186
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_1.101010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_1.101010.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..09dbc85dd6414d522d73947f2a49ad317c092bcb
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_1.101010.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e6bb60dca811b9201d4410223ae4f8ede82fcf65094cce874fd61225824c436f
+size 377173
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_1.101010_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_1.101010_expected.vtu
deleted file mode 100644
index 4c6cb959d6810ae09d97235604e19bf10dfbe4a4..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_1.101010_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9da89b11be1337ca5a40d4c9d42b0717df74d51ff2174cf9ea2caba1ee619b3
-size 377186
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_10.000000.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_10.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..b1ab746479629fa2a172f5f1cfcb60388a85fbc9
--- /dev/null
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_10.000000.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e70a54e2fe6c2e0e2efaf5888da3f3785919a6b0f4349442af757fac8d402e96
+size 377173
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_10.000000_expected.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_10.000000_expected.vtu
deleted file mode 100644
index 91b41ee35e0346258310022ccb30f9637b6d689f..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/flux_1e4_t_10.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14bfddced5dfc1a5b38560bea12b0c1f27d2700524b341f2ada9e34227c91641
-size 377186