diff --git a/Applications/CLI/CMakeLists.txt b/Applications/CLI/CMakeLists.txt
index d0d9d60ccc5eb2b216ed10cc81852c1d54d77f76..2c7aafaac8327a4100d02d665e8fd9e69099533d 100644
--- a/Applications/CLI/CMakeLists.txt
+++ b/Applications/CLI/CMakeLists.txt
@@ -16,7 +16,11 @@ if(OGS_USE_PETSC)
     target_link_libraries(ogs ${PETSC_LIBRARIES})
 endif()
 
-include(Tests.cmake)
+####################
+### Tests ##########
+####################
+add_test(NAME ogs_no_args COMMAND ogs)
+set_tests_properties(ogs_no_args PROPERTIES WILL_FAIL TRUE)
 
 ####################
 ### Installation ###
diff --git a/Applications/CLI/Tests.cmake b/Applications/CLI/Tests.cmake
deleted file mode 100644
index 0dca4d2276661e1d805fe8915776f73e290dc7c0..0000000000000000000000000000000000000000
--- a/Applications/CLI/Tests.cmake
+++ /dev/null
@@ -1,1113 +0,0 @@
-
-add_test(NAME ogs_no_args COMMAND ogs)
-set_tests_properties(ogs_no_args PROPERTIES WILL_FAIL TRUE)
-
-if(NOT OGS_USE_MPI)
-    # CUBE 1x1x1 GROUNDWATER FLOW TESTS
-    foreach(mesh_size 1e0 1e1 1e2 1e3)
-        AddTest(
-            NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS cube_${mesh_size}.prj
-            TESTER vtkdiff
-            ABSTOL 1e-15 RELTOL 1e-15
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}_Newton
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS cube_${mesh_size}_newton.prj
-            TESTER vtkdiff
-            ABSTOL 1e-15 RELTOL 1e-15
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_newton_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
-            TESTER vtkdiff
-            ABSTOL 1e-1 RELTOL 1e-1
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_front_N1_right pressure
-        )
-    endforeach()
-
-    foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
-        AddTest(
-            NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS cube_${mesh_size}.prj
-            TESTER vtkdiff
-            ABSTOL 1e-13 RELTOL 1e-13
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
-            TESTER vtkdiff
-            ABSTOL 1e-2 RELTOL 1e-2
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_front_N1_right pressure
-        )
-    endforeach()
-
-    # SQUARE 1x1 GROUNDWATER FLOW TESTS
-    foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
-        AddTest(
-            NAME GroundWaterFlowProcess_square_1x1_${mesh_size}
-            PATH Elliptic/square_1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS square_${mesh_size}.prj
-            TESTER vtkdiff
-            ABSTOL 1e-13 RELTOL 1e-13
-            DIFF_DATA
-            square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
-            PATH Elliptic/square_1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
-            TESTER vtkdiff
-            ABSTOL 1e-1 RELTOL 1e-1
-            DIFF_DATA
-            square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_bottom_N1_right pressure
-        )
-    endforeach()
-
-    foreach(mesh_size 1e5 1e6)
-        AddTest(
-            NAME LARGE_GroundWaterFlowProcess_square_1x1_${mesh_size}
-            PATH Elliptic/square_1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS square_${mesh_size}.prj
-            TESTER vtkdiff
-            ABSTOL 1e-12 RELTOL 1e-16
-            DIFF_DATA
-            square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME LARGE_GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
-            PATH Elliptic/square_1x1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
-            TESTER vtkdiff
-            ABSTOL 1e-02 RELTOL 1e-02
-            DIFF_DATA
-            square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_bottom_N1_right pressure
-        )
-    endforeach()
-
-    # LINE 1 GROUNDWATER FLOW TESTS
-    foreach(mesh_size 1e1)
-        AddTest(
-            NAME GroundWaterFlowProcess_line_1_${mesh_size}
-            PATH Elliptic/line_1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS line_${mesh_size}.prj
-            TESTER vtkdiff
-            ABSTOL 1e-15 RELTOL 1e-15
-            DIFF_DATA
-            line_1_line_${mesh_size}.vtu line_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_line_1_Neumann_${mesh_size}
-            PATH Elliptic/line_1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS line_${mesh_size}_neumann.prj
-            TESTER vtkdiff
-            ABSTOL 1e-14 RELTOL 1e-14
-            DIFF_DATA
-            line_1_line_${mesh_size}.vtu line_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_N1_right pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_line_1_Robin_Right_Picard_${mesh_size}
-            PATH Elliptic/line_1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS line_${mesh_size}_robin_right_picard.prj
-            TESTER vtkdiff
-            ABSTOL 4e-14 RELTOL 2e-14
-            DIFF_DATA
-            line_1_line_${mesh_size}.vtu line_${mesh_size}_robin_right_picard_pcs_0_ts_1_t_1.000000.vtu D1_left_N1_right pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_line_1_Robin_Left_Picard_${mesh_size}
-            PATH Elliptic/line_1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS line_${mesh_size}_robin_left_picard.prj
-            TESTER vtkdiff
-            ABSTOL 1e-14 RELTOL 1e-14
-            DIFF_DATA
-            line_1_line_${mesh_size}.vtu line_${mesh_size}_robin_left_picard_pcs_0_ts_1_t_1.000000.vtu D1_left_N1_right pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_line_1_Time_Dep_Dirichlet_${mesh_size}
-            PATH Elliptic/line_1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS line_${mesh_size}_time_dep_dirichlet.prj
-            TESTER vtkdiff
-            ABSTOL 1e-14 RELTOL 1e-14
-            DIFF_DATA
-            line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_dirichlet_pcs_0_ts_1_t_1.000000.vtu t_1s pressure
-            line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_dirichlet_pcs_0_ts_5_t_5.000000.vtu t_5s pressure
-            line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_dirichlet_pcs_0_ts_10_t_10.000000.vtu t_10s pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_line_1_Time_Dep_Neumann_${mesh_size}
-            PATH Elliptic/line_1_GroundWaterFlow
-            EXECUTABLE ogs
-            EXECUTABLE_ARGS line_${mesh_size}_time_dep_neumann.prj
-            TESTER vtkdiff
-            ABSTOL 1e-14 RELTOL 1e-14
-            DIFF_DATA
-            line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_neumann_pcs_0_ts_1_t_1.000000.vtu t_1s pressure
-            line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_neumann_pcs_0_ts_5_t_5.000000.vtu t_5s pressure
-            line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_neumann_pcs_0_ts_10_t_10.000000.vtu t_10s pressure
-        )
-    endforeach()
-
-    # Some Neumann BC tests
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_top
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e3_top_neumann.prj
-        TESTER vtkdiff
-        ABSTOL 1e-14 RELTOL 1e-14
-        DIFF_DATA
-        cube_1e3_top_neumann.vtu cube_1e3_top_neumann_pcs_0_ts_1_t_1.000000.vtu pressure pressure
-    )
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_bottom
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e3_bottom_neumann.prj
-        TESTER vtkdiff
-        ABSTOL 1e-14 RELTOL 1e-14
-        DIFF_DATA
-        cube_1e3_bottom_neumann.vtu cube_1e3_bottom_neumann_pcs_0_ts_1_t_1.000000.vtu pressure pressure
-    )
-    # Some Neumann BC tests -- Newton
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_top_Newton
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e3_top_neumann_newton.prj
-        TESTER vtkdiff
-        ABSTOL 1e-14 RELTOL 1e-14
-        DIFF_DATA
-        cube_1e3_top_neumann.vtu cube_1e3_top_neumann_newton_pcs_0_ts_1_t_1.000000.vtu pressure pressure
-    )
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_bottom_Newton
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e3_bottom_neumann_newton.prj
-        TESTER vtkdiff
-        ABSTOL 1e-14 RELTOL 1e-14
-        DIFF_DATA
-        cube_1e3_bottom_neumann.vtu cube_1e3_bottom_neumann_newton_pcs_0_ts_1_t_1.000000.vtu pressure pressure
-    )
-
-    # test CalculateSurfaceFlux
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_1e3_dirichlet_calculatesurfaceflux
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e3_calculatesurfaceflux.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-15
-        DIFF_DATA
-        cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_surfaceflux.vtu surfaceflux_left_right_dirichlet_reference surfaceflux
-    )
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_1e3_neumann_calculatesurfaceflux
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e3_neumann_calculatesurfaceflux.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-15
-        DIFF_DATA
-        cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_neumann_surfaceflux.vtu surfaceflux_neumann_reference surfaceflux
-    )
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_left_right
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_left_right.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-15
-        DIFF_DATA
-        cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_surfaceflux.vtu surfaceflux_left_right_reference surfaceflux_left_right
-    )
-
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_front_back
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_front_back.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-15
-        DIFF_DATA
-        cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_surfaceflux.vtu surfaceflux_front_back_reference surfaceflux_front_back
-    )
-
-    AddTest(
-        NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_top_bottom
-        PATH Elliptic/cube_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_top_bottom.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-15
-        DIFF_DATA
-        cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_surfaceflux.vtu surfaceflux_top_bottom_reference surfaceflux_top_bottom
-    )
-
-    AddTest(
-        NAME GroundWaterFlowProcess_wedge_1x1x1_1e3_prism_surfaceflux
-        PATH Elliptic/wedge_1x1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS wedge_1e3_prism_surfaceflux_diagonal.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-15
-        DIFF_DATA
-        wedge_1x1x1_1e3_prism_complete_surface.vtu wedge_1x1x1_1e3_prism_complete_surface_surfaceflux.vtu surfaceflux_reference surfaceflux
-    )
-
-    # TES tests
-    AddTest(
-        NAME TES_zeolite_discharge_small
-        PATH Parabolic/TES/1D
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS tes-1D-zeolite-discharge-small.prj
-        TESTER vtkdiff
-        ABSTOL 1e-7 RELTOL 5e-9
-        DIFF_DATA
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu pressure pressure
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu temperature temperature
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu vapour_partial_pressure vapour_partial_pressure
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu solid_density solid_density
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu solid_density fct_solid_density
-    )
-
-    AddTest(
-        NAME LARGE_TES_zeolite_discharge
-        PATH Parabolic/TES/1D
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj
-        TESTER vtkdiff
-        ABSTOL 1e-3 RELTOL 1e-4
-        DIFF_DATA
-        tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu pressure pressure
-        tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu temperature temperature
-        tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu vapour_partial_pressure vapour_partial_pressure
-        tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu solid_density solid_density
-        tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu solid_density fct_solid_density
-    )
-
-    AddTest(
-        NAME LARGE_TES_zeolite_discharge_Newton
-        PATH Parabolic/TES/1D
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS tes-1D-zeolite-discharge-small-newton.prj
-        TESTER vtkdiff
-        ABSTOL 1.5e-3 RELTOL 1.5e-3
-        DIFF_DATA
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_newton_pcs_0_ts_32_t_0.100000.vtu pressure pressure
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_newton_pcs_0_ts_32_t_0.100000.vtu temperature temperature
-        # tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_newton_pcs_0_ts_32_t_0.100000.vtu vapour_partial_pressure vapour_partial_pressure
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_newton_pcs_0_ts_32_t_0.100000.vtu solid_density solid_density
-    )
-
-    AddTest(
-         NAME 1D_HeatConduction_dirichlet
-         PATH Parabolic/T/1D_dirichlet
-         EXECUTABLE ogs
-         EXECUTABLE_ARGS line_60_heat.prj
-         TESTER vtkdiff
-         ABSTOL 1e-5 RELTOL 1e-5
-         DIFF_DATA
-         temperature_analytical.vtu line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu Temperature_Analytical_2months temperature
-         temperature_analytical.vtu line_60_heat_pcs_0_ts_405_t_31640625.000000.vtu Temperature_Analytical_1year temperature
-    )
-
-    AddTest(
-         NAME 1D_HeatConduction_neumann
-         PATH Parabolic/T/1D_neumann
-         EXECUTABLE ogs
-         EXECUTABLE_ARGS line_60_heat.prj
-         TESTER vtkdiff
-         ABSTOL 1e-4 RELTOL 1e-4
-         DIFF_DATA
-         temperature_analytical.vtu line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu Temperature_Analytical_2months temperature
-         temperature_analytical.vtu line_60_heat_pcs_0_ts_405_t_31640625.000000.vtu Temperature_Analytical_1year temperature
-    )
-
-    AddTest(
-         NAME LARGE_2D_RichardsFlow_h_us_quad
-         PATH Parabolic/Richards
-         EXECUTABLE ogs
-         EXECUTABLE_ARGS RichardsFlow_2d.prj
-         TESTER vtkdiff
-         ABSTOL 1e-1 RELTOL 1e-1
-         DIFF_DATA
-         h_us_quad_1000.vtu richards_pcs_0_ts_100_t_100.000000.vtu PRESSURE1 pressure
-    )
-     AddTest(
-         NAME 2D_TwoPhase_PP_Lia_quad
-         PATH Parabolic/TwoPhaseFlowPP/Liakopoulos
-         EXECUTABLE ogs
-         EXECUTABLE_ARGS Twophase_Lia_quad2_short.prj
-         TESTER vtkdiff
-         ABSTOL 1e-8 RELTOL 1e-12
-         DIFF_DATA
-         Lia_20.vtu twophaseflow_pcs_0_ts_119_t_20.000000.vtu capillary_pressure capillary_pressure
-         Lia_20.vtu twophaseflow_pcs_0_ts_119_t_20.000000.vtu gas_pressure gas_pressure
-         Lia_20.vtu twophaseflow_pcs_0_ts_119_t_20.000000.vtu saturation saturation
-    )
-    AddTest(
-         NAME LARGE_2D_TwoPhase_PP_Lia_quad
-         PATH Parabolic/TwoPhaseFlowPP/Liakopoulos
-         EXECUTABLE ogs
-         EXECUTABLE_ARGS Twophase_Lia_quad2_large.prj
-         TESTER vtkdiff
-         ABSTOL 1e-8 RELTOL 1e-12
-         DIFF_DATA
-         Lia_1000.vtu twophaseflow_pcs_0_ts_1180_t_1000.000000.vtu capillary_pressure capillary_pressure
-         Lia_1000.vtu twophaseflow_pcs_0_ts_1180_t_1000.000000.vtu gas_pressure gas_pressure
-         Lia_1000.vtu twophaseflow_pcs_0_ts_1180_t_1000.000000.vtu saturation saturation
-    )
-
-    AddTest(
-         NAME LARGE_2D_ThermalConvection_constviscosity
-         PATH Parabolic/HT/ConstViscosity
-         EXECUTABLE ogs
-         EXECUTABLE_ARGS square_5500x5500.prj
-         WRAPPER time
-         TESTER vtkdiff
-         ABSTOL 1e-10 RELTOL 1e-16
-         DIFF_DATA
-         ThermalConvection_const_viscosity_expected.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000.000000.vtu temperature T
-    )
-
-    # Mechanics; Small deformations, linear (SDL)
-    AddTest(
-        NAME Mechanics_SDL_square_1e0_displacementBC
-        PATH Mechanics/Linear
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e0.prj
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        square_1e0_expected_pcs_0_ts_4_t_1.000000.vtu square_1e0_pcs_0_ts_4_t_1.000000.vtu displacement displacement
-    )
-    AddTest(
-        NAME Mechanics_SDL_square_1e2_tractionBC
-        PATH Mechanics/Linear
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e2.prj
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        square_1e2_expected_pcs_0_ts_4_t_1.000000.vtu square_1e2_pcs_0_ts_4_t_1.000000.vtu displacement displacement
-    )
-    AddTest(
-        NAME LARGE_Mechanics_SDL_disc_with_hole
-        PATH Mechanics/Linear
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS disc_with_hole.prj
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        disc_with_hole_expected_pcs_0_ts_4_t_1.000000.vtu disc_with_hole_pcs_0_ts_4_t_1.000000.vtu displacement displacement
-    )
-    AddTest(
-        NAME LARGE_Mechanics_SDL_square_1e5_tractionBC
-        PATH Mechanics/Linear
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e5.prj
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        square_1e5_expected_pcs_0_ts_4_t_1.000000.vtu square_1e5_pcs_0_ts_4_t_1.000000.vtu displacement displacement
-    )
-    AddTest(
-        NAME Mechanics_SDL_square_1e2_quad8_traction_topBC
-        PATH Mechanics/Linear
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e2_quad8_traction_top.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-14 RELTOL 1e-15
-        DIFF_DATA
-        expected_square_1e2_quad8_traction_topBC_pcs_0_ts_4_t_1.000000.vtu square_1e2_quad8_traction_topBC_pcs_0_ts_4_t_1.000000.vtu displacement displacement
-    )
-
-    # Mechanics; Small deformations, Burgers (SDB)
-    AddTest(
-        NAME Mechanics_SDB_cube_1e0_tractionBC
-        PATH Mechanics/Burgers
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e0.prj
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        cube_1e0_expected_pcs_0_ts_1_t_0.000100.vtu cube_1e0_pcs_0_ts_1_t_0.000100.vtu displacement displacement
-        cube_1e0_expected_pcs_0_ts_101_t_1.000000.vtu cube_1e0_pcs_0_ts_101_t_1.000000.vtu displacement displacement
-    )
-    AddTest(
-        NAME LARGE_Mechanics_SDB_cube_1e3_tractionBC
-        PATH Mechanics/Burgers
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e3.prj
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        cube_1e3_expected_pcs_0_ts_1_t_0.000100.vtu cube_1e3_pcs_0_ts_1_t_0.000100.vtu displacement displacement
-        cube_1e3_expected_pcs_0_ts_101_t_1.000000.vtu cube_1e3_pcs_0_ts_101_t_1.000000.vtu displacement displacement
-    )
-
-    # Mechanics; Small deformations, Ehlers (SDE)
-    AddTest(
-        NAME Mechanics_SDE_cube_1e0
-        PATH Mechanics/Ehlers
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e0.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-13
-        DIFF_DATA
-        expected_cube_1e0_pcs_0_ts_101_t_2.550000.vtu cube_1e0_pcs_0_ts_101_t_2.550000.vtu displacement displacement
-        expected_cube_1e0_pcs_0_ts_101_t_2.550000.vtu cube_1e0_pcs_0_ts_101_t_2.550000.vtu sigma_xx sigma_xx
-        expected_cube_1e0_pcs_0_ts_203_t_5.100000.vtu cube_1e0_pcs_0_ts_203_t_5.100000.vtu displacement displacement
-        expected_cube_1e0_pcs_0_ts_203_t_5.100000.vtu cube_1e0_pcs_0_ts_203_t_5.100000.vtu sigma_xx sigma_xx
-    )
-    AddTest(
-        NAME Mechanics_SDE_cube_1e1
-        PATH Mechanics/Ehlers
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e1.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-13
-        DIFF_DATA
-        expected_cube_1e1_pcs_0_ts_101_t_2.550000.vtu cube_1e1_pcs_0_ts_101_t_2.550000.vtu displacement displacement
-        expected_cube_1e1_pcs_0_ts_101_t_2.550000.vtu cube_1e1_pcs_0_ts_101_t_2.550000.vtu sigma_xx sigma_xx
-        expected_cube_1e1_pcs_0_ts_203_t_5.100000.vtu cube_1e1_pcs_0_ts_203_t_5.100000.vtu displacement displacement
-        expected_cube_1e1_pcs_0_ts_203_t_5.100000.vtu cube_1e1_pcs_0_ts_203_t_5.100000.vtu sigma_xx sigma_xx
-    )
-    AddTest(
-        NAME LARGE_Mechanics_SDE_cube_1e3
-        PATH Mechanics/Ehlers
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e3.prj
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-13
-        DIFF_DATA
-        expected_cube_1e3_pcs_0_ts_101_t_2.550000.vtu cube_1e3_pcs_0_ts_101_t_2.550000.vtu displacement displacement
-        expected_cube_1e3_pcs_0_ts_101_t_2.550000.vtu cube_1e3_pcs_0_ts_101_t_2.550000.vtu sigma_xx sigma_xx
-        expected_cube_1e3_pcs_0_ts_203_t_5.100000.vtu cube_1e3_pcs_0_ts_203_t_5.100000.vtu displacement displacement
-        expected_cube_1e3_pcs_0_ts_203_t_5.100000.vtu cube_1e3_pcs_0_ts_203_t_5.100000.vtu sigma_xx sigma_xx
-    )
-
-    # Mechanics; Small deformations, Drucker-Prager (SDE-DP)
-    AddTest(
-        NAME Mechanics_PlasticModel_SDE-DP_Ehlers_SpecialCase_DruckerPrager
-        PATH Mechanics/Ehlers
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS cube_1e0_dp.prj
-        TESTER vtkdiff
-        ABSTOL 5e-15 RELTOL 1e-13
-        DIFF_DATA
-        expected_cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu displacement displacement
-        expected_cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu sigma_xx sigma_xx
-    )
-
-    # SQUARE 1x1 GROUNDWATER FLOW TEST -- AXIALLY SYMMETRIC
-    # test results are compared to 3D simulation on a wedge-shaped domain
-    AddTest(
-        NAME GroundWaterFlowProcess_square_1x1_1e2_axi
-        PATH Elliptic/square_1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e2_axi.prj
-        TESTER vtkdiff
-        ABSTOL 1.6e-5 RELTOL 1e-5
-        DIFF_DATA
-        wedge-1e2-ang-0.02-surface.vtu square_1e2_axi_pcs_0_ts_1_t_1.000000.vtu temperature temperature
-    )
-    # # WEDGE 1x1 GROUNDWATER FLOW TEST -- computes reference results for the above test
-    # AddTest(
-    #     NAME GroundWaterFlowProcess_wedge_1e2_ang_0.02
-    #     PATH Elliptic/square_1x1_GroundWaterFlow
-    #     EXECUTABLE ogs
-    #     EXECUTABLE_ARGS wedge_1e2_axi_ang_0.02.prj
-    # )
-
-    # SQUARE 1x1 GROUNDWATER FLOW TEST -- AXIALLY SYMMETRIC
-    # test results are compared to 3D simulation on a wedge-shaped domain
-    AddTest(
-        NAME GroundWaterFlowProcess_square_1x1_1e4_axi_ang_0.02
-        PATH Elliptic/square_1x1_GroundWaterFlow
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e4_axi.prj
-        TESTER vtkdiff
-        ABSTOL 1.6e-5 RELTOL 1e-5
-        DIFF_DATA
-        wedge-1e4-ang-0.02-surface.vtu square_1e4_axi_pcs_0_ts_1_t_1.000000.vtu temperature temperature
-    )
-    # # WEDGE 1x1 GROUNDWATER FLOW TEST -- computes reference results for the above test
-    # AddTest(
-    #     NAME GroundWaterFlowProcess_wedge_1e4_ang_0.02
-    #     PATH Elliptic/square_1x1_GroundWaterFlow
-    #     EXECUTABLE ogs
-    #     EXECUTABLE_ARGS wedge_1e4_axi_ang_0.02.prj
-    # )
-
-    # SMALL DEFORMATION TEST -- AXIALLY SYMMETRIC
-    AddTest(
-        NAME LARGE_SmallDeformation_ring_plane_strain_axi
-        PATH Mechanics/Linear
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS ring_plane_strain.prj
-        TESTER vtkdiff
-        ABSTOL 6e-4 RELTOL 1e-4
-        DIFF_DATA
-        ring_plane_strain_1e4_solution.vtu ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu u displacement
-        ring_plane_strain_1e4_solution.vtu ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu sigma_rr sigma_rr
-        ring_plane_strain_1e4_solution.vtu ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu sigma_ff sigma_ff
-    )
-
-    # SQUARE 1x1 HEAT CONDUCTION TEST -- AXIALLY SYMMETRIC
-    # test results are compared to 3D simulation on a wedge-shaped domain
-    AddTest(
-         NAME 2D_HeatConduction_axi
-         PATH Parabolic/T/2D_axially_symmetric
-         EXECUTABLE ogs
-         EXECUTABLE_ARGS square_1e2_axi.prj
-         TESTER vtkdiff
-         ABSTOL 1.7e-5 RELTOL 1e-5
-         DIFF_DATA
-         wedge_1e2_axi_ang_0.02_t_2s_extracted_surface.vtu square_1e2_axi_pcs_0_ts_2_t_2.000000.vtu temperature temperature
-         wedge_1e2_axi_ang_0.02_t_2s_extracted_surface.vtu square_1e2_axi_pcs_0_ts_2_t_2.000000.vtu heat_flux_x heat_flux_x
-    )
-    # # WEDGE 1x1 HEATCONDUCTION TEST -- computes reference results for the above test
-    # AddTest(
-    #      NAME 2D_HeatConduction_wedge
-    #      PATH Parabolic/T/2D_axially_symmetric
-    #      EXECUTABLE ogs
-    #      EXECUTABLE_ARGS wedge_1e2_axi_ang_0.02.prj
-    # )
-
-    # SQUARE 1x1 TES TEST -- AXIALLY SYMMETRIC
-    # test results are compared to 3D simulation on a wedge-shaped domain
-    AddTest(
-        NAME LARGE_TES_inert_axi
-        PATH Parabolic/TES/2D
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS tes-inert-axi.prj
-        TESTER vtkdiff
-        # Note: Since the temperature and pressure only vary by a factor of ~ 1.e-6 in x-direction
-        # the relative tolerance has to be much smaller than 1.e-6
-        ABSTOL 1e-12 RELTOL 2e-9
-        DIFF_DATA
-        inert-wedge-extracted-surface-t-1s.vtu tes_inert_axi_pcs_0_ts_4_t_1.000000.vtu pressure pressure
-        inert-wedge-extracted-surface-t-1s.vtu tes_inert_axi_pcs_0_ts_4_t_1.000000.vtu temperature temperature
-        inert-wedge-extracted-surface-t-1s.vtu tes_inert_axi_pcs_0_ts_4_t_1.000000.vtu v_mass_frac v_mass_frac
-    )
-    # # WEDGE 1x1 TES TEST -- computes reference results for the above test
-    # AddTest(
-    #     NAME TES_inert_wedge
-    #     PATH Parabolic/TES/2D
-    #     EXECUTABLE ogs
-    #     EXECUTABLE_ARGS tes-inert-wedge.prj
-    # )
-
-    # HydroMechanics; Small deformations, linear poroelastic (HML)
-    AddTest(
-        NAME HydroMechanics_HML_square_1e2_confined_compression
-        PATH HydroMechanics/Linear
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e2.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-15
-        DIFF_DATA
-        expected_square_1e2_pcs_0_ts_1_t_5.000000.vtu square_1e2_pcs_0_ts_1_t_5.000000.vtu displacement displacement
-        expected_square_1e2_pcs_0_ts_20_t_100.000000.vtu square_1e2_pcs_0_ts_20_t_100.000000.vtu displacement displacement
-        expected_square_1e2_pcs_0_ts_120_t_1000.000000.vtu square_1e2_pcs_0_ts_120_t_1000.000000.vtu displacement displacement
-        expected_square_1e2_pcs_0_ts_420_t_4000.000000.vtu square_1e2_pcs_0_ts_420_t_4000.000000.vtu displacement displacement
-        expected_square_1e2_pcs_0_ts_1_t_5.000000.vtu square_1e2_pcs_0_ts_1_t_5.000000.vtu pressure pressure
-        expected_square_1e2_pcs_0_ts_20_t_100.000000.vtu square_1e2_pcs_0_ts_20_t_100.000000.vtu pressure pressure
-        expected_square_1e2_pcs_0_ts_120_t_1000.000000.vtu square_1e2_pcs_0_ts_120_t_1000.000000.vtu pressure pressure
-        expected_square_1e2_pcs_0_ts_420_t_4000.000000.vtu square_1e2_pcs_0_ts_420_t_4000.000000.vtu pressure pressure
-    )
-    # HydroMechanics; Small deformation, linear poroelastic (unconfined compression early) The drainage process is ongoing and the displacement behaviour is related to water pressure and solid properties.
-    AddTest(
-        NAME HydroMechanics_HML_square_1e2_unconfined_compression_early
-        PATH HydroMechanics/Linear/Unconfined_Compression_early
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e2_UC_early.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-3 RELTOL 1e-3
-        DIFF_DATA
-        UnconfinedCompressionAnalytical_1s.vtu square_1e2_UC_early_pcs_0_ts_10_t_1.000000.vtu displacement_ana displacement
-    )
-    # HydroMechanics; Small deformation, linear poroelastic (unconfined compression late) the drainage process is finished and the displacement of the porous media is only a result of solid properties.
-    AddTest(
-        NAME HydroMechanics_HML_square_1e2_unconfined_compression_late
-        PATH HydroMechanics/Linear/Unconfined_Compression_late
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS square_1e2_UC_late.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-3 RELTOL 1e-3
-        DIFF_DATA
-        UnconfinedCompressionAnalytical_1000s.vtu square_1e2_UC_late_pcs_0_ts_10_t_1000.000000.vtu displacement_ana displacement
-    )
-
-
-    # LIE; Small deformation
-    AddTest(
-        NAME LIE_M_single_joint
-        PATH LIE/Mechanics
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS single_joint.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        single_joint_expected_pcs_0_ts_1_t_1.000000.vtu single_joint_pcs_0_ts_1_t_1.000000.vtu displacement displacement
-        single_joint_expected_pcs_0_ts_1_t_1.000000.vtu single_joint_pcs_0_ts_1_t_1.000000.vtu displacement_jump1 displacement_jump1
-    )
-
-    AddTest(
-        NAME LIE_M_single_joint_inside
-        PATH LIE/Mechanics
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS single_joint_inside.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        single_joint_inside_expected_pcs_0_ts_1_t_1.000000.vtu single_joint_inside_pcs_0_ts_1_t_1.000000.vtu displacement displacement
-        single_joint_inside_expected_pcs_0_ts_1_t_1.000000.vtu single_joint_inside_pcs_0_ts_1_t_1.000000.vtu displacement_jump1 displacement_jump1
-    )
-
-    AddTest(
-        NAME LIE_M_two_joints
-        PATH LIE/Mechanics
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS two_joints.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        two_joints_expected_pcs_0_ts_1_t_1.000000.vtu two_joints_pcs_0_ts_1_t_1.000000.vtu displacement displacement
-        two_joints_expected_pcs_0_ts_1_t_1.000000.vtu two_joints_pcs_0_ts_1_t_1.000000.vtu displacement_jump1 displacement_jump1
-        two_joints_expected_pcs_0_ts_1_t_1.000000.vtu two_joints_pcs_0_ts_1_t_1.000000.vtu displacement_jump2 displacement_jump2
-    )
-
-    # LIE; HydroMechanics
-    AddTest(
-        NAME LIE_HM_single_fracture
-        PATH LIE/HydroMechanics
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS single_fracture.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-12 RELTOL 1e-12
-        DIFF_DATA
-        expected_single_fracture_pcs_0_ts_10_t_100.000000.vtu single_fracture_pcs_0_ts_10_t_100.000000.vtu pressure pressure
-        expected_single_fracture_pcs_0_ts_10_t_100.000000.vtu single_fracture_pcs_0_ts_10_t_100.000000.vtu displacement displacement
-        expected_single_fracture_pcs_0_ts_10_t_100.000000.vtu single_fracture_pcs_0_ts_10_t_100.000000.vtu displacement_jump1 displacement_jump1
-    )
-
-    AddTest(
-        NAME LIE_HM_TaskB
-        PATH LIE/HydroMechanics
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS TaskB.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-12 RELTOL 1e-12
-        DIFF_DATA
-        expected_TaskB_pcs_0_ts_4_t_18.000000.vtu TaskB_pcs_0_ts_4_t_18.000000.vtu pressure pressure
-        expected_TaskB_pcs_0_ts_4_t_18.000000.vtu TaskB_pcs_0_ts_4_t_18.000000.vtu displacement displacement
-        expected_TaskB_pcs_0_ts_4_t_18.000000.vtu TaskB_pcs_0_ts_4_t_18.000000.vtu displacement_jump1 displacement_jump1
-    )
-
-    # Liquid flow
-    AddTest(
-        NAME LiquidFlow_LineDirichletNeumannBC
-        PATH Parabolic/LiquidFlow/LineDirichletNeumannBC
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS line_dirichlet_neumannBC.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-8 RELTOL 1e-8
-        DIFF_DATA
-        sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure
-        sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticVec v_x
-    )
-    AddTest(
-        NAME LiquidFlow_PressureBCatCornerOfAnisotropicSquare
-        PATH Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS pressureBC_at_corner_of_anisotropic_square.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-8 RELTOL 1e-8
-        DIFF_DATA
-        mesh2D.vtu sat_2D_lflow_pcs_0_ts_1_t_1.000000.vtu OGS5_Results pressure
-    )
-    AddTest(
-        NAME LiquidFlow_GravityDriven
-        PATH Parabolic/LiquidFlow/GravityDriven
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS gravity_driven.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-8 RELTOL 1e-8
-        DIFF_DATA
-        mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure
-        mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVx v_x
-        mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVy v_y
-    )
-    AddTest(
-        NAME LiquidFlow_AxisymTheis
-        PATH Parabolic/LiquidFlow/AxiSymTheis
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS axisym_theis.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-8 RELTOL 1e-8
-        DIFF_DATA
-        axisym_theis.vtu liquid_pcs_pcs_0_ts_30_t_1728.000000.vtu OGS5_pressure pressure
-    )
-
-    AddTest(
-        NAME LARGE_LiquidFlow_Anisotropic_GravityDriven3D
-        PATH Parabolic/LiquidFlow/GravityDriven3D
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS anisotropic_gravity_driven3D.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-6 RELTOL 1e-6
-        DIFF_DATA
-        hex.vtu anisotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
-    )
-
-    AddTest(
-        NAME LARGE_LiquidFlow_Isotropic_GravityDriven3D
-        PATH Parabolic/LiquidFlow/GravityDriven3D
-        EXECUTABLE ogs
-        EXECUTABLE_ARGS isotropic_gravity_driven3D.prj
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-6 RELTOL 1e-6
-        DIFF_DATA
-        hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
-    )
-
-else()
-    # MPI groundwater flow tests
-    AddTest(
-        NAME ParallelFEM_GroundWaterFlow2D
-        PATH EllipticPETSc
-        EXECUTABLE_ARGS quad_20x10_GroundWaterFlow.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 3
-        TESTER vtkdiff
-        ABSTOL 1e-15 RELTOL 1e-14
-        DIFF_DATA
-        quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_0.vtu quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
-        quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_1.vtu quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
-        quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_2.vtu quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_2.vtu pressure pressure
-    )
-
-    AddTest(
-        NAME ParallelFEM_GroundWaterFlow3D_DirichletBC
-        PATH EllipticPETSc
-        EXECUTABLE_ARGS cube_1e3.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 3
-        TESTER vtkdiff
-        ABSTOL 1e-14 RELTOL 1e-6
-        DIFF_DATA
-        cube_1e3_pcs_0_ts_1_t_1_000000_0.vtu cube_1e3_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
-        cube_1e3_pcs_0_ts_1_t_1_000000_1.vtu cube_1e3_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
-        cube_1e3_pcs_0_ts_1_t_1_000000_2.vtu cube_1e3_pcs_0_ts_1_t_1_000000_2.vtu pressure pressure
-    )
-
-    AddTest(
-        NAME ParallelFEM_GroundWaterFlow3D_NeumannBC
-        PATH EllipticPETSc
-        EXECUTABLE_ARGS cube_1e3_neumann.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 3
-        TESTER vtkdiff
-        ABSTOL 1e-14 RELTOL 1e-14
-        DIFF_DATA
-        cube_1e3_neumann_pcs_0_ts_1_t_1_000000_0.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
-        cube_1e3_neumann_pcs_0_ts_1_t_1_000000_1.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
-        cube_1e3_neumann_pcs_0_ts_1_t_1_000000_2.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_2.vtu pressure pressure
-    )
-
-    # Single core
-    # CUBE 1x1x1 GROUNDWATER FLOW TESTS
-    foreach(mesh_size 1e0 1e1 1e2 1e3)
-        AddTest(
-            NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE_ARGS cube_${mesh_size}.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-15 RELTOL 1e-15
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-1 RELTOL 1e-1
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_front_N1_right pressure
-        )
-    endforeach()
-
-
-    foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
-        AddTest(
-            NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE_ARGS cube_${mesh_size}.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-7 RELTOL 1e-7
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
-            PATH Elliptic/cube_1x1x1_GroundWaterFlow
-            EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-2 RELTOL 1e-2
-            DIFF_DATA
-            cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_front_N1_right pressure
-        )
-    endforeach()
-
-    # SQUARE 1x1 GROUNDWATER FLOW TESTS
-    foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
-        AddTest(
-            NAME GroundWaterFlowProcess_square_1x1_${mesh_size}
-            PATH Elliptic/square_1x1_GroundWaterFlow
-            EXECUTABLE_ARGS square_${mesh_size}.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-13 RELTOL 1e-13
-            DIFF_DATA
-            square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
-            PATH Elliptic/square_1x1_GroundWaterFlow
-            EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-1 RELTOL 1e-1
-            DIFF_DATA
-            square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_bottom_N1_right pressure
-        )
-    endforeach()
-
-    foreach(mesh_size 1e5 1e6)
-        AddTest(
-            NAME LARGE_GroundWaterFlowProcess_square_1x1_${mesh_size}
-            PATH Elliptic/square_1x1_GroundWaterFlow
-            EXECUTABLE_ARGS square_${mesh_size}.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-7 RELTOL 1e-7
-            DIFF_DATA
-            square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME LARGE_GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
-            PATH Elliptic/square_1x1_GroundWaterFlow
-            EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-02 RELTOL 1e-02
-            DIFF_DATA
-            square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_bottom_N1_right pressure
-        )
-    endforeach()
-
-    # LINE 1 GROUNDWATER FLOW TESTS
-    foreach(mesh_size 1e1)
-        AddTest(
-            NAME GroundWaterFlowProcess_line_1_${mesh_size}
-            PATH Elliptic/line_1_GroundWaterFlow
-            EXECUTABLE_ARGS line_${mesh_size}.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-15 RELTOL 1e-15
-            DIFF_DATA
-            line_1_line_${mesh_size}.vtu line_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
-        )
-
-        AddTest(
-            NAME GroundWaterFlowProcess_line_1_Neumann_${mesh_size}
-            PATH Elliptic/line_1_GroundWaterFlow
-            EXECUTABLE_ARGS line_${mesh_size}_neumann.prj
-            WRAPPER mpirun
-            WRAPPER_ARGS -np 1
-            TESTER vtkdiff
-            ABSTOL 1e-14 RELTOL 1e-14
-            DIFF_DATA
-            line_1_line_${mesh_size}.vtu line_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_N1_right pressure
-        )
-    endforeach()
-
-    AddTest(
-        NAME TES_zeolite_discharge_small
-        PATH Parabolic/TES/1D
-        EXECUTABLE_ARGS tes-1D-zeolite-discharge-small.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 1
-        TESTER vtkdiff
-        ABSTOL 1e-7 RELTOL 5e-9
-        DIFF_DATA
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu pressure pressure
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu temperature temperature
-        tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu v_mass_frac v_mass_frac
-#        tes_zeolite_discharge_small_ts_19_t_0.100000.vtu solid_density solid_density
-    )
-
-    AddTest(
-        NAME LARGE_TES_zeolite_discharge
-        PATH Parabolic/TES/1D
-        EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 1
-        TESTER vtkdiff
-        ABSTOL 1e-16 RELTOL 1e-16
-        DIFF_DATA
-        tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu pressure pressure
-        tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu temperature temperature
-        tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu v_mass_frac v_mass_frac
-#        tes_zeolite_discharge_large_ts_28_t_1_0.vtu solid_density solid_density
-    )
-
-    # Liquid flow
-    AddTest(
-        NAME LiquidFlow_LineDirichletNeumannBC
-        PATH Parabolic/LiquidFlow/LineDirichletNeumannBC
-        EXECUTABLE_ARGS line_dirichlet_neumannBC.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 1
-        TESTER vtkdiff
-        ABSTOL 1e-8 RELTOL 1e-8
-        DIFF_DATA
-        sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure
-        sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticVec v_x
-    )
-    AddTest(
-        NAME LiquidFlow_GravityDriven
-        PATH Parabolic/LiquidFlow/GravityDriven
-        EXECUTABLE_ARGS gravity_driven.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 1
-        TESTER vtkdiff
-        ABSTOL 1e-8 RELTOL 1e-8
-        DIFF_DATA
-        mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure
-        mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVx v_x
-        mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVy v_y
-    )
-    AddTest(
-        NAME LiquidFlow_PressureBCatCornerOfAnisotropicSquare
-        PATH Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare
-        EXECUTABLE_ARGS pressureBC_at_corner_of_anisotropic_square.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 1
-        TESTER vtkdiff
-        ABSTOL 1e-8 RELTOL 1e-8
-        DIFF_DATA
-        mesh2D.vtu sat_2D_lflow_pcs_0_ts_1_t_1.000000.vtu OGS5_Results pressure
-    )
-    AddTest(
-        NAME LiquidFlow_AxisymTheis
-        PATH Parabolic/LiquidFlow/AxiSymTheis
-        EXECUTABLE_ARGS axisym_theis.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 1
-        TESTER vtkdiff
-        ABSTOL 1e-8 RELTOL 1e-8
-        DIFF_DATA
-        axisym_theis.vtu liquid_pcs_pcs_0_ts_30_t_1728.000000.vtu OGS5_pressure pressure
-    )
-    AddTest(
-        NAME LARGE_LiquidFlow_Anisotropic_GravityDriven3D
-        PATH Parabolic/LiquidFlow/GravityDriven3D
-        EXECUTABLE_ARGS anisotropic_gravity_driven3D.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 1
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-6 RELTOL 1e-6
-        DIFF_DATA
-        hex.vtu anisotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
-    )
-
-    AddTest(
-        NAME LARGE_LiquidFlow_Isotropic_GravityDriven3D
-        PATH Parabolic/LiquidFlow/GravityDriven3D
-        EXECUTABLE_ARGS isotropic_gravity_driven3D.prj
-        WRAPPER mpirun
-        WRAPPER_ARGS -np 1
-        WRAPPER time
-        TESTER vtkdiff
-        ABSTOL 1e-6 RELTOL 1e-6
-        DIFF_DATA
-        hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
-    )
-
-endif()
diff --git a/ProcessLib/GroundwaterFlow/CMakeLists.txt b/ProcessLib/GroundwaterFlow/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..718427e3fd8a4374d0e28e97c073bfcd51b3dbd0 100644
--- a/ProcessLib/GroundwaterFlow/CMakeLists.txt
+++ b/ProcessLib/GroundwaterFlow/CMakeLists.txt
@@ -0,0 +1,549 @@
+# CUBE 1x1x1 GROUNDWATER FLOW TESTS
+foreach(mesh_size 1e0 1e1 1e2 1e3)
+    AddTest(
+        NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS cube_${mesh_size}.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-15 RELTOL 1e-15
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}_Newton
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS cube_${mesh_size}_newton.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-15 RELTOL 1e-15
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_newton_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-1 RELTOL 1e-1
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_front_N1_right pressure
+    )
+endforeach()
+
+foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
+    AddTest(
+        NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS cube_${mesh_size}.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-13 RELTOL 1e-13
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-2 RELTOL 1e-2
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_front_N1_right pressure
+    )
+endforeach()
+
+# SQUARE 1x1 GROUNDWATER FLOW TESTS
+foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
+    AddTest(
+        NAME GroundWaterFlowProcess_square_1x1_${mesh_size}
+        PATH Elliptic/square_1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS square_${mesh_size}.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-13 RELTOL 1e-13
+        DIFF_DATA
+        square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
+        PATH Elliptic/square_1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-1 RELTOL 1e-1
+        DIFF_DATA
+        square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_bottom_N1_right pressure
+    )
+endforeach()
+
+foreach(mesh_size 1e5 1e6)
+    AddTest(
+        NAME LARGE_GroundWaterFlowProcess_square_1x1_${mesh_size}
+        PATH Elliptic/square_1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS square_${mesh_size}.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-12 RELTOL 1e-16
+        DIFF_DATA
+        square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME LARGE_GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
+        PATH Elliptic/square_1x1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-02 RELTOL 1e-02
+        DIFF_DATA
+        square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_bottom_N1_right pressure
+    )
+endforeach()
+
+# LINE 1 GROUNDWATER FLOW TESTS
+foreach(mesh_size 1e1)
+    AddTest(
+        NAME GroundWaterFlowProcess_line_1_${mesh_size}
+        PATH Elliptic/line_1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS line_${mesh_size}.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-15 RELTOL 1e-15
+        DIFF_DATA
+        line_1_line_${mesh_size}.vtu line_${mesh_size}_pcs_0_ts_1_t_1.000000.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_line_1_Neumann_${mesh_size}
+        PATH Elliptic/line_1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS line_${mesh_size}_neumann.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-14 RELTOL 1e-14
+        DIFF_DATA
+        line_1_line_${mesh_size}.vtu line_${mesh_size}_neumann_pcs_0_ts_1_t_1.000000.vtu D1_left_N1_right pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_line_1_Robin_Right_Picard_${mesh_size}
+        PATH Elliptic/line_1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS line_${mesh_size}_robin_right_picard.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 4e-14 RELTOL 2e-14
+        DIFF_DATA
+        line_1_line_${mesh_size}.vtu line_${mesh_size}_robin_right_picard_pcs_0_ts_1_t_1.000000.vtu D1_left_N1_right pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_line_1_Robin_Left_Picard_${mesh_size}
+        PATH Elliptic/line_1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS line_${mesh_size}_robin_left_picard.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-14 RELTOL 1e-14
+        DIFF_DATA
+        line_1_line_${mesh_size}.vtu line_${mesh_size}_robin_left_picard_pcs_0_ts_1_t_1.000000.vtu D1_left_N1_right pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_line_1_Time_Dep_Dirichlet_${mesh_size}
+        PATH Elliptic/line_1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS line_${mesh_size}_time_dep_dirichlet.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-14 RELTOL 1e-14
+        DIFF_DATA
+        line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_dirichlet_pcs_0_ts_1_t_1.000000.vtu t_1s pressure
+        line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_dirichlet_pcs_0_ts_5_t_5.000000.vtu t_5s pressure
+        line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_dirichlet_pcs_0_ts_10_t_10.000000.vtu t_10s pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_line_1_Time_Dep_Neumann_${mesh_size}
+        PATH Elliptic/line_1_GroundWaterFlow
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS line_${mesh_size}_time_dep_neumann.prj
+        TESTER vtkdiff
+        REQUIREMENTS NOT OGS_USE_MPI
+        ABSTOL 1e-14 RELTOL 1e-14
+        DIFF_DATA
+        line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_neumann_pcs_0_ts_1_t_1.000000.vtu t_1s pressure
+        line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_neumann_pcs_0_ts_5_t_5.000000.vtu t_5s pressure
+        line_1_time_dep_dirichlet.vtu line_${mesh_size}_time_dep_neumann_pcs_0_ts_10_t_10.000000.vtu t_10s pressure
+    )
+endforeach()
+
+# Some Neumann BC tests
+AddTest(
+    NAME GroundWaterFlowProcess_cube_top
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e3_top_neumann.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-14 RELTOL 1e-14
+    DIFF_DATA
+    cube_1e3_top_neumann.vtu cube_1e3_top_neumann_pcs_0_ts_1_t_1.000000.vtu pressure pressure
+)
+AddTest(
+    NAME GroundWaterFlowProcess_cube_bottom
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e3_bottom_neumann.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-14 RELTOL 1e-14
+    DIFF_DATA
+    cube_1e3_bottom_neumann.vtu cube_1e3_bottom_neumann_pcs_0_ts_1_t_1.000000.vtu pressure pressure
+)
+# Some Neumann BC tests -- Newton
+AddTest(
+    NAME GroundWaterFlowProcess_cube_top_Newton
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e3_top_neumann_newton.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-14 RELTOL 1e-14
+    DIFF_DATA
+    cube_1e3_top_neumann.vtu cube_1e3_top_neumann_newton_pcs_0_ts_1_t_1.000000.vtu pressure pressure
+)
+AddTest(
+    NAME GroundWaterFlowProcess_cube_bottom_Newton
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e3_bottom_neumann_newton.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-14 RELTOL 1e-14
+    DIFF_DATA
+    cube_1e3_bottom_neumann.vtu cube_1e3_bottom_neumann_newton_pcs_0_ts_1_t_1.000000.vtu pressure pressure
+)
+
+# test CalculateSurfaceFlux
+AddTest(
+    NAME GroundWaterFlowProcess_cube_1x1x1_1e3_dirichlet_calculatesurfaceflux
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e3_calculatesurfaceflux.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-15
+    DIFF_DATA
+    cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_surfaceflux.vtu surfaceflux_left_right_dirichlet_reference surfaceflux
+)
+AddTest(
+    NAME GroundWaterFlowProcess_cube_1x1x1_1e3_neumann_calculatesurfaceflux
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e3_neumann_calculatesurfaceflux.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-15
+    DIFF_DATA
+    cube_1x1x1_hex_1e3_complete_surface.vtu cube_1x1x1_hex_1e3_complete_surface_neumann_surfaceflux.vtu surfaceflux_neumann_reference surfaceflux
+)
+AddTest(
+    NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_left_right
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_left_right.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-15
+    DIFF_DATA
+    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_left_right_dirichlet_surfaceflux.vtu surfaceflux_left_right_reference surfaceflux_left_right
+)
+
+AddTest(
+    NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_front_back
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_front_back.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-15
+    DIFF_DATA
+    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_front_back_dirichlet_surfaceflux.vtu surfaceflux_front_back_reference surfaceflux_front_back
+)
+
+AddTest(
+    NAME GroundWaterFlowProcess_cube_1x1x1_2e3_prism_surfaceflux_top_bottom
+    PATH Elliptic/cube_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_2e3_prism_surfaceflux_top_bottom.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-15
+    DIFF_DATA
+    cube_1x1x1_prism_2e3_complete_surface.vtu cube_1x1x1_prism_2e3_complete_surface_top_bottom_dirichlet_surfaceflux.vtu surfaceflux_top_bottom_reference surfaceflux_top_bottom
+)
+
+AddTest(
+    NAME GroundWaterFlowProcess_wedge_1x1x1_1e3_prism_surfaceflux
+    PATH Elliptic/wedge_1x1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS wedge_1e3_prism_surfaceflux_diagonal.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-15
+    DIFF_DATA
+    wedge_1x1x1_1e3_prism_complete_surface.vtu wedge_1x1x1_1e3_prism_complete_surface_surfaceflux.vtu surfaceflux_reference surfaceflux
+)
+
+# SQUARE 1x1 GROUNDWATER FLOW TEST -- AXIALLY SYMMETRIC
+# test results are compared to 3D simulation on a wedge-shaped domain
+AddTest(
+    NAME GroundWaterFlowProcess_square_1x1_1e2_axi
+    PATH Elliptic/square_1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e2_axi.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1.6e-5 RELTOL 1e-5
+    DIFF_DATA
+    wedge-1e2-ang-0.02-surface.vtu square_1e2_axi_pcs_0_ts_1_t_1.000000.vtu temperature temperature
+)
+# # WEDGE 1x1 GROUNDWATER FLOW TEST -- computes reference results for the above test
+# AddTest(
+#     NAME GroundWaterFlowProcess_wedge_1e2_ang_0.02
+#     PATH Elliptic/square_1x1_GroundWaterFlow
+#     EXECUTABLE ogs
+#     EXECUTABLE_ARGS wedge_1e2_axi_ang_0.02.prj
+# )
+
+# SQUARE 1x1 GROUNDWATER FLOW TEST -- AXIALLY SYMMETRIC
+# test results are compared to 3D simulation on a wedge-shaped domain
+AddTest(
+    NAME GroundWaterFlowProcess_square_1x1_1e4_axi_ang_0.02
+    PATH Elliptic/square_1x1_GroundWaterFlow
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e4_axi.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1.6e-5 RELTOL 1e-5
+    DIFF_DATA
+    wedge-1e4-ang-0.02-surface.vtu square_1e4_axi_pcs_0_ts_1_t_1.000000.vtu temperature temperature
+)
+# # WEDGE 1x1 GROUNDWATER FLOW TEST -- computes reference results for the above test
+# AddTest(
+#     NAME GroundWaterFlowProcess_wedge_1e4_ang_0.02
+#     PATH Elliptic/square_1x1_GroundWaterFlow
+#     EXECUTABLE ogs
+#     EXECUTABLE_ARGS wedge_1e4_axi_ang_0.02.prj
+# )
+
+# MPI groundwater flow tests
+AddTest(
+    NAME ParallelFEM_GroundWaterFlow2D
+    PATH EllipticPETSc
+    EXECUTABLE_ARGS quad_20x10_GroundWaterFlow.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 3
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-14
+    DIFF_DATA
+    quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_0.vtu quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
+    quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_1.vtu quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
+    quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_2.vtu quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_t_1_000000_2.vtu pressure pressure
+)
+
+AddTest(
+    NAME ParallelFEM_GroundWaterFlow3D_DirichletBC
+    PATH EllipticPETSc
+    EXECUTABLE_ARGS cube_1e3.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 3
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-14 RELTOL 1e-6
+    DIFF_DATA
+    cube_1e3_pcs_0_ts_1_t_1_000000_0.vtu cube_1e3_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
+    cube_1e3_pcs_0_ts_1_t_1_000000_1.vtu cube_1e3_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
+    cube_1e3_pcs_0_ts_1_t_1_000000_2.vtu cube_1e3_pcs_0_ts_1_t_1_000000_2.vtu pressure pressure
+)
+
+AddTest(
+    NAME ParallelFEM_GroundWaterFlow3D_NeumannBC
+    PATH EllipticPETSc
+    EXECUTABLE_ARGS cube_1e3_neumann.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 3
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-14 RELTOL 1e-14
+    DIFF_DATA
+    cube_1e3_neumann_pcs_0_ts_1_t_1_000000_0.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_0.vtu pressure pressure
+    cube_1e3_neumann_pcs_0_ts_1_t_1_000000_1.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_1.vtu pressure pressure
+    cube_1e3_neumann_pcs_0_ts_1_t_1_000000_2.vtu cube_1e3_neumann_pcs_0_ts_1_t_1_000000_2.vtu pressure pressure
+)
+
+# Single core
+# CUBE 1x1x1 GROUNDWATER FLOW TESTS
+foreach(mesh_size 1e0 1e1 1e2 1e3)
+    AddTest(
+        NAME GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE_ARGS cube_${mesh_size}.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-15 RELTOL 1e-15
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-1 RELTOL 1e-1
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_front_N1_right pressure
+    )
+endforeach()
+
+
+foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
+    AddTest(
+        NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE_ARGS cube_${mesh_size}.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-7 RELTOL 1e-7
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
+        PATH Elliptic/cube_1x1x1_GroundWaterFlow
+        EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-2 RELTOL 1e-2
+        DIFF_DATA
+        cube_1x1x1_hex_${mesh_size}.vtu cube_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_front_N1_right pressure
+    )
+endforeach()
+
+# SQUARE 1x1 GROUNDWATER FLOW TESTS
+foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
+    AddTest(
+        NAME GroundWaterFlowProcess_square_1x1_${mesh_size}
+        PATH Elliptic/square_1x1_GroundWaterFlow
+        EXECUTABLE_ARGS square_${mesh_size}.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-13 RELTOL 1e-13
+        DIFF_DATA
+        square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
+        PATH Elliptic/square_1x1_GroundWaterFlow
+        EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-1 RELTOL 1e-1
+        DIFF_DATA
+        square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_bottom_N1_right pressure
+    )
+endforeach()
+
+foreach(mesh_size 1e5 1e6)
+    AddTest(
+        NAME LARGE_GroundWaterFlowProcess_square_1x1_${mesh_size}
+        PATH Elliptic/square_1x1_GroundWaterFlow
+        EXECUTABLE_ARGS square_${mesh_size}.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-7 RELTOL 1e-7
+        DIFF_DATA
+        square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME LARGE_GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
+        PATH Elliptic/square_1x1_GroundWaterFlow
+        EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-02 RELTOL 1e-02
+        DIFF_DATA
+        square_1x1_quad_${mesh_size}.vtu square_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_bottom_N1_right pressure
+    )
+endforeach()
+
+# LINE 1 GROUNDWATER FLOW TESTS
+foreach(mesh_size 1e1)
+    AddTest(
+        NAME GroundWaterFlowProcess_line_1_${mesh_size}
+        PATH Elliptic/line_1_GroundWaterFlow
+        EXECUTABLE_ARGS line_${mesh_size}.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-15 RELTOL 1e-15
+        DIFF_DATA
+        line_1_line_${mesh_size}.vtu line_${mesh_size}_pcs_0_ts_1_t_1_000000_0.vtu Linear_1_to_minus1 pressure
+    )
+
+    AddTest(
+        NAME GroundWaterFlowProcess_line_1_Neumann_${mesh_size}
+        PATH Elliptic/line_1_GroundWaterFlow
+        EXECUTABLE_ARGS line_${mesh_size}_neumann.prj
+        WRAPPER mpirun
+        WRAPPER_ARGS -np 1
+        TESTER vtkdiff
+        REQUIREMENTS OGS_USE_MPI
+        ABSTOL 1e-14 RELTOL 1e-14
+        DIFF_DATA
+        line_1_line_${mesh_size}.vtu line_${mesh_size}_neumann_pcs_0_ts_1_t_1_000000_0.vtu D1_left_N1_right pressure
+    )
+endforeach()
+
+
diff --git a/ProcessLib/HT/CMakeLists.txt b/ProcessLib/HT/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..83d9a4beb0af88fd9ac445b13b9cfde24c60ebec
--- /dev/null
+++ b/ProcessLib/HT/CMakeLists.txt
@@ -0,0 +1,12 @@
+AddTest(
+    NAME LARGE_2D_ThermalConvection_constviscosity
+    PATH Parabolic/HT/ConstViscosity
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_5500x5500.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
+    ABSTOL 1e-10 RELTOL 1e-16
+    DIFF_DATA
+    ThermalConvection_const_viscosity_expected.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000.000000.vtu temperature T
+)
diff --git a/ProcessLib/HeatConduction/CMakeLists.txt b/ProcessLib/HeatConduction/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..946e6b13e863a440c15e708e7bc4552a8cdead65 100644
--- a/ProcessLib/HeatConduction/CMakeLists.txt
+++ b/ProcessLib/HeatConduction/CMakeLists.txt
@@ -0,0 +1,47 @@
+AddTest(
+        NAME 1D_HeatConduction_dirichlet
+        PATH Parabolic/T/1D_dirichlet
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS line_60_heat.prj
+        TESTER vtkdiff
+        ABSTOL 1e-5 RELTOL 1e-5
+        DIFF_DATA
+        temperature_analytical.vtu line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu Temperature_Analytical_2months temperature
+        temperature_analytical.vtu line_60_heat_pcs_0_ts_405_t_31640625.000000.vtu Temperature_Analytical_1year temperature
+    REQUIREMENTS NOT OGS_USE_MPI
+)
+
+AddTest(
+        NAME 1D_HeatConduction_neumann
+        PATH Parabolic/T/1D_neumann
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS line_60_heat.prj
+        TESTER vtkdiff
+        ABSTOL 1e-4 RELTOL 1e-4
+        DIFF_DATA
+        temperature_analytical.vtu line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu Temperature_Analytical_2months temperature
+        temperature_analytical.vtu line_60_heat_pcs_0_ts_405_t_31640625.000000.vtu Temperature_Analytical_1year temperature
+    REQUIREMENTS NOT OGS_USE_MPI
+)
+
+# SQUARE 1x1 HEAT CONDUCTION TEST -- AXIALLY SYMMETRIC
+# test results are compared to 3D simulation on a wedge-shaped domain
+AddTest(
+        NAME 2D_HeatConduction_axi
+        PATH Parabolic/T/2D_axially_symmetric
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS square_1e2_axi.prj
+        TESTER vtkdiff
+        ABSTOL 1.7e-5 RELTOL 1e-5
+        DIFF_DATA
+        wedge_1e2_axi_ang_0.02_t_2s_extracted_surface.vtu square_1e2_axi_pcs_0_ts_2_t_2.000000.vtu temperature temperature
+        wedge_1e2_axi_ang_0.02_t_2s_extracted_surface.vtu square_1e2_axi_pcs_0_ts_2_t_2.000000.vtu heat_flux_x heat_flux_x
+    REQUIREMENTS NOT OGS_USE_MPI
+)
+# # WEDGE 1x1 HEATCONDUCTION TEST -- computes reference results for the above test
+# AddTest(
+#      NAME 2D_HeatConduction_wedge
+#      PATH Parabolic/T/2D_axially_symmetric
+#      EXECUTABLE ogs
+#      EXECUTABLE_ARGS wedge_1e2_axi_ang_0.02.prj
+# )
diff --git a/ProcessLib/HydroMechanics/CMakeLists.txt b/ProcessLib/HydroMechanics/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ceb48c1a7ab4238dfb1eed9885c484a2f06bee2c
--- /dev/null
+++ b/ProcessLib/HydroMechanics/CMakeLists.txt
@@ -0,0 +1,46 @@
+# HydroMechanics; Small deformations, linear poroelastic (HML)
+AddTest(
+    NAME HydroMechanics_HML_square_1e2_confined_compression
+    PATH HydroMechanics/Linear
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e2.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-15
+    DIFF_DATA
+    expected_square_1e2_pcs_0_ts_1_t_5.000000.vtu square_1e2_pcs_0_ts_1_t_5.000000.vtu displacement displacement
+    expected_square_1e2_pcs_0_ts_20_t_100.000000.vtu square_1e2_pcs_0_ts_20_t_100.000000.vtu displacement displacement
+    expected_square_1e2_pcs_0_ts_120_t_1000.000000.vtu square_1e2_pcs_0_ts_120_t_1000.000000.vtu displacement displacement
+    expected_square_1e2_pcs_0_ts_420_t_4000.000000.vtu square_1e2_pcs_0_ts_420_t_4000.000000.vtu displacement displacement
+    expected_square_1e2_pcs_0_ts_1_t_5.000000.vtu square_1e2_pcs_0_ts_1_t_5.000000.vtu pressure pressure
+    expected_square_1e2_pcs_0_ts_20_t_100.000000.vtu square_1e2_pcs_0_ts_20_t_100.000000.vtu pressure pressure
+    expected_square_1e2_pcs_0_ts_120_t_1000.000000.vtu square_1e2_pcs_0_ts_120_t_1000.000000.vtu pressure pressure
+    expected_square_1e2_pcs_0_ts_420_t_4000.000000.vtu square_1e2_pcs_0_ts_420_t_4000.000000.vtu pressure pressure
+)
+# HydroMechanics; Small deformation, linear poroelastic (unconfined compression early) The drainage process is ongoing and the displacement behaviour is related to water pressure and solid properties.
+AddTest(
+    NAME HydroMechanics_HML_square_1e2_unconfined_compression_early
+    PATH HydroMechanics/Linear/Unconfined_Compression_early
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e2_UC_early.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-3 RELTOL 1e-3
+    DIFF_DATA
+    UnconfinedCompressionAnalytical_1s.vtu square_1e2_UC_early_pcs_0_ts_10_t_1.000000.vtu displacement_ana displacement
+)
+# HydroMechanics; Small deformation, linear poroelastic (unconfined compression late) the drainage process is finished and the displacement of the porous media is only a result of solid properties.
+AddTest(
+    NAME HydroMechanics_HML_square_1e2_unconfined_compression_late
+    PATH HydroMechanics/Linear/Unconfined_Compression_late
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e2_UC_late.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-3 RELTOL 1e-3
+    DIFF_DATA
+    UnconfinedCompressionAnalytical_1000s.vtu square_1e2_UC_late_pcs_0_ts_10_t_1000.000000.vtu displacement_ana displacement
+)
diff --git a/ProcessLib/LIE/HydroMechanics/CMakeLists.txt b/ProcessLib/LIE/HydroMechanics/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7338e8f0eb79648a18f7778c0943fd33f9b4ca64
--- /dev/null
+++ b/ProcessLib/LIE/HydroMechanics/CMakeLists.txt
@@ -0,0 +1,30 @@
+# LIE; HydroMechanics
+AddTest(
+    NAME LIE_HM_single_fracture
+    PATH LIE/HydroMechanics
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS single_fracture.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
+    ABSTOL 1e-12 RELTOL 1e-12
+    DIFF_DATA
+    expected_single_fracture_pcs_0_ts_10_t_100.000000.vtu single_fracture_pcs_0_ts_10_t_100.000000.vtu pressure pressure
+    expected_single_fracture_pcs_0_ts_10_t_100.000000.vtu single_fracture_pcs_0_ts_10_t_100.000000.vtu displacement displacement
+    expected_single_fracture_pcs_0_ts_10_t_100.000000.vtu single_fracture_pcs_0_ts_10_t_100.000000.vtu displacement_jump1 displacement_jump1
+)
+
+AddTest(
+    NAME LIE_HM_TaskB
+    PATH LIE/HydroMechanics
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS TaskB.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
+    ABSTOL 1e-12 RELTOL 1e-12
+    DIFF_DATA
+    expected_TaskB_pcs_0_ts_4_t_18.000000.vtu TaskB_pcs_0_ts_4_t_18.000000.vtu pressure pressure
+    expected_TaskB_pcs_0_ts_4_t_18.000000.vtu TaskB_pcs_0_ts_4_t_18.000000.vtu displacement displacement
+    expected_TaskB_pcs_0_ts_4_t_18.000000.vtu TaskB_pcs_0_ts_4_t_18.000000.vtu displacement_jump1 displacement_jump1
+)
diff --git a/ProcessLib/LIE/SmallDeformation/CMakeLists.txt b/ProcessLib/LIE/SmallDeformation/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0b4c31deeb3b0c7d986dd3ae81a6b2e684c70ea1
--- /dev/null
+++ b/ProcessLib/LIE/SmallDeformation/CMakeLists.txt
@@ -0,0 +1,43 @@
+# LIE; Small deformation
+AddTest(
+    NAME LIE_M_single_joint
+    PATH LIE/Mechanics
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS single_joint.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    single_joint_expected_pcs_0_ts_1_t_1.000000.vtu single_joint_pcs_0_ts_1_t_1.000000.vtu displacement displacement
+    single_joint_expected_pcs_0_ts_1_t_1.000000.vtu single_joint_pcs_0_ts_1_t_1.000000.vtu displacement_jump1 displacement_jump1
+)
+
+AddTest(
+    NAME LIE_M_single_joint_inside
+    PATH LIE/Mechanics
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS single_joint_inside.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    single_joint_inside_expected_pcs_0_ts_1_t_1.000000.vtu single_joint_inside_pcs_0_ts_1_t_1.000000.vtu displacement displacement
+    single_joint_inside_expected_pcs_0_ts_1_t_1.000000.vtu single_joint_inside_pcs_0_ts_1_t_1.000000.vtu displacement_jump1 displacement_jump1
+)
+
+AddTest(
+    NAME LIE_M_two_joints
+    PATH LIE/Mechanics
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS two_joints.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    two_joints_expected_pcs_0_ts_1_t_1.000000.vtu two_joints_pcs_0_ts_1_t_1.000000.vtu displacement displacement
+    two_joints_expected_pcs_0_ts_1_t_1.000000.vtu two_joints_pcs_0_ts_1_t_1.000000.vtu displacement_jump1 displacement_jump1
+    two_joints_expected_pcs_0_ts_1_t_1.000000.vtu two_joints_pcs_0_ts_1_t_1.000000.vtu displacement_jump2 displacement_jump2
+)
diff --git a/ProcessLib/LiquidFlow/CMakeLists.txt b/ProcessLib/LiquidFlow/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..780da8abccf3637e1a8a4251e8cb3bfeeb5977ad
--- /dev/null
+++ b/ProcessLib/LiquidFlow/CMakeLists.txt
@@ -0,0 +1,156 @@
+# Liquid flow
+AddTest(
+    NAME LiquidFlow_LineDirichletNeumannBC
+    PATH Parabolic/LiquidFlow/LineDirichletNeumannBC
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS line_dirichlet_neumannBC.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-8
+    DIFF_DATA
+    sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure
+    sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticVec v_x
+)
+AddTest(
+    NAME LiquidFlow_PressureBCatCornerOfAnisotropicSquare
+    PATH Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS pressureBC_at_corner_of_anisotropic_square.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-8
+    DIFF_DATA
+    mesh2D.vtu sat_2D_lflow_pcs_0_ts_1_t_1.000000.vtu OGS5_Results pressure
+)
+AddTest(
+    NAME LiquidFlow_GravityDriven
+    PATH Parabolic/LiquidFlow/GravityDriven
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS gravity_driven.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-8
+    DIFF_DATA
+    mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure
+    mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVx v_x
+    mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVy v_y
+)
+AddTest(
+    NAME LiquidFlow_AxisymTheis
+    PATH Parabolic/LiquidFlow/AxiSymTheis
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS axisym_theis.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-8
+    DIFF_DATA
+    axisym_theis.vtu liquid_pcs_pcs_0_ts_30_t_1728.000000.vtu OGS5_pressure pressure
+)
+
+AddTest(
+    NAME LARGE_LiquidFlow_Anisotropic_GravityDriven3D
+    PATH Parabolic/LiquidFlow/GravityDriven3D
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS anisotropic_gravity_driven3D.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-6 RELTOL 1e-6
+    DIFF_DATA
+    hex.vtu anisotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
+)
+
+AddTest(
+    NAME LARGE_LiquidFlow_Isotropic_GravityDriven3D
+    PATH Parabolic/LiquidFlow/GravityDriven3D
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS isotropic_gravity_driven3D.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-6 RELTOL 1e-6
+    DIFF_DATA
+    hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
+)
+
+# Liquid flow
+AddTest(
+    NAME LiquidFlow_LineDirichletNeumannBC
+    PATH Parabolic/LiquidFlow/LineDirichletNeumannBC
+    EXECUTABLE_ARGS line_dirichlet_neumannBC.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-8
+    DIFF_DATA
+    sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure
+    sat1D.vtu sat_1D_pcs_0_ts_1_t_1.000000.vtu AnalyticVec v_x
+)
+AddTest(
+    NAME LiquidFlow_GravityDriven
+    PATH Parabolic/LiquidFlow/GravityDriven
+    EXECUTABLE_ARGS gravity_driven.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-8
+    DIFF_DATA
+    mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticPressure pressure
+    mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVx v_x
+    mesh2D.vtu gravity_driven_pcs_0_ts_1_t_1.000000.vtu AnalyticVy v_y
+)
+AddTest(
+    NAME LiquidFlow_PressureBCatCornerOfAnisotropicSquare
+    PATH Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare
+    EXECUTABLE_ARGS pressureBC_at_corner_of_anisotropic_square.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-8
+    DIFF_DATA
+    mesh2D.vtu sat_2D_lflow_pcs_0_ts_1_t_1.000000.vtu OGS5_Results pressure
+)
+AddTest(
+    NAME LiquidFlow_AxisymTheis
+    PATH Parabolic/LiquidFlow/AxiSymTheis
+    EXECUTABLE_ARGS axisym_theis.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-8
+    DIFF_DATA
+    axisym_theis.vtu liquid_pcs_pcs_0_ts_30_t_1728.000000.vtu OGS5_pressure pressure
+)
+AddTest(
+    NAME LARGE_LiquidFlow_Anisotropic_GravityDriven3D
+    PATH Parabolic/LiquidFlow/GravityDriven3D
+    EXECUTABLE_ARGS anisotropic_gravity_driven3D.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-6 RELTOL 1e-6
+    DIFF_DATA
+    hex.vtu anisotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
+)
+
+AddTest(
+    NAME LARGE_LiquidFlow_Isotropic_GravityDriven3D
+    PATH Parabolic/LiquidFlow/GravityDriven3D
+    EXECUTABLE_ARGS isotropic_gravity_driven3D.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-6 RELTOL 1e-6
+    DIFF_DATA
+    hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
+)
diff --git a/ProcessLib/RichardsFlow/CMakeLists.txt b/ProcessLib/RichardsFlow/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..46511bb561d41e3afbb08c151ea7fdc2eecc1008
--- /dev/null
+++ b/ProcessLib/RichardsFlow/CMakeLists.txt
@@ -0,0 +1,11 @@
+AddTest(
+        NAME LARGE_2D_RichardsFlow_h_us_quad
+        PATH Parabolic/Richards
+        EXECUTABLE ogs
+        EXECUTABLE_ARGS RichardsFlow_2d.prj
+        TESTER vtkdiff
+        ABSTOL 1e-1 RELTOL 1e-1
+        DIFF_DATA
+        h_us_quad_1000.vtu richards_pcs_0_ts_100_t_100.000000.vtu PRESSURE1 pressure
+    REQUIREMENTS NOT OGS_USE_MPI
+)
diff --git a/ProcessLib/SmallDeformation/CMakeLists.txt b/ProcessLib/SmallDeformation/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5b28055c9745c50c918b3486f0541822b252ac36
--- /dev/null
+++ b/ProcessLib/SmallDeformation/CMakeLists.txt
@@ -0,0 +1,159 @@
+# Mechanics; Small deformations, linear (SDL)
+AddTest(
+    NAME Mechanics_SDL_square_1e0_displacementBC
+    PATH Mechanics/Linear
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e0.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    square_1e0_expected_pcs_0_ts_4_t_1.000000.vtu square_1e0_pcs_0_ts_4_t_1.000000.vtu displacement displacement
+)
+AddTest(
+    NAME Mechanics_SDL_square_1e2_tractionBC
+    PATH Mechanics/Linear
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e2.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    square_1e2_expected_pcs_0_ts_4_t_1.000000.vtu square_1e2_pcs_0_ts_4_t_1.000000.vtu displacement displacement
+)
+AddTest(
+    NAME LARGE_Mechanics_SDL_disc_with_hole
+    PATH Mechanics/Linear
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS disc_with_hole.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    disc_with_hole_expected_pcs_0_ts_4_t_1.000000.vtu disc_with_hole_pcs_0_ts_4_t_1.000000.vtu displacement displacement
+)
+AddTest(
+    NAME LARGE_Mechanics_SDL_square_1e5_tractionBC
+    PATH Mechanics/Linear
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e5.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    square_1e5_expected_pcs_0_ts_4_t_1.000000.vtu square_1e5_pcs_0_ts_4_t_1.000000.vtu displacement displacement
+)
+AddTest(
+    NAME Mechanics_SDL_square_1e2_quad8_traction_topBC
+    PATH Mechanics/Linear
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_1e2_quad8_traction_top.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-14 RELTOL 1e-15
+    DIFF_DATA
+    expected_square_1e2_quad8_traction_topBC_pcs_0_ts_4_t_1.000000.vtu square_1e2_quad8_traction_topBC_pcs_0_ts_4_t_1.000000.vtu displacement displacement
+)
+
+# Mechanics; Small deformations, Burgers (SDB)
+AddTest(
+    NAME Mechanics_SDB_cube_1e0_tractionBC
+    PATH Mechanics/Burgers
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e0.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    cube_1e0_expected_pcs_0_ts_1_t_0.000100.vtu cube_1e0_pcs_0_ts_1_t_0.000100.vtu displacement displacement
+    cube_1e0_expected_pcs_0_ts_101_t_1.000000.vtu cube_1e0_pcs_0_ts_101_t_1.000000.vtu displacement displacement
+)
+AddTest(
+    NAME LARGE_Mechanics_SDB_cube_1e3_tractionBC
+    PATH Mechanics/Burgers
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e3.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    cube_1e3_expected_pcs_0_ts_1_t_0.000100.vtu cube_1e3_pcs_0_ts_1_t_0.000100.vtu displacement displacement
+    cube_1e3_expected_pcs_0_ts_101_t_1.000000.vtu cube_1e3_pcs_0_ts_101_t_1.000000.vtu displacement displacement
+)
+
+# Mechanics; Small deformations, Ehlers (SDE)
+AddTest(
+    NAME Mechanics_SDE_cube_1e0
+    PATH Mechanics/Ehlers
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e0.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-13
+    DIFF_DATA
+    expected_cube_1e0_pcs_0_ts_101_t_2.550000.vtu cube_1e0_pcs_0_ts_101_t_2.550000.vtu displacement displacement
+    expected_cube_1e0_pcs_0_ts_101_t_2.550000.vtu cube_1e0_pcs_0_ts_101_t_2.550000.vtu sigma_xx sigma_xx
+    expected_cube_1e0_pcs_0_ts_203_t_5.100000.vtu cube_1e0_pcs_0_ts_203_t_5.100000.vtu displacement displacement
+    expected_cube_1e0_pcs_0_ts_203_t_5.100000.vtu cube_1e0_pcs_0_ts_203_t_5.100000.vtu sigma_xx sigma_xx
+)
+AddTest(
+    NAME Mechanics_SDE_cube_1e1
+    PATH Mechanics/Ehlers
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e1.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-13
+    DIFF_DATA
+    expected_cube_1e1_pcs_0_ts_101_t_2.550000.vtu cube_1e1_pcs_0_ts_101_t_2.550000.vtu displacement displacement
+    expected_cube_1e1_pcs_0_ts_101_t_2.550000.vtu cube_1e1_pcs_0_ts_101_t_2.550000.vtu sigma_xx sigma_xx
+    expected_cube_1e1_pcs_0_ts_203_t_5.100000.vtu cube_1e1_pcs_0_ts_203_t_5.100000.vtu displacement displacement
+    expected_cube_1e1_pcs_0_ts_203_t_5.100000.vtu cube_1e1_pcs_0_ts_203_t_5.100000.vtu sigma_xx sigma_xx
+)
+AddTest(
+    NAME LARGE_Mechanics_SDE_cube_1e3
+    PATH Mechanics/Ehlers
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e3.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-15 RELTOL 1e-13
+    DIFF_DATA
+    expected_cube_1e3_pcs_0_ts_101_t_2.550000.vtu cube_1e3_pcs_0_ts_101_t_2.550000.vtu displacement displacement
+    expected_cube_1e3_pcs_0_ts_101_t_2.550000.vtu cube_1e3_pcs_0_ts_101_t_2.550000.vtu sigma_xx sigma_xx
+    expected_cube_1e3_pcs_0_ts_203_t_5.100000.vtu cube_1e3_pcs_0_ts_203_t_5.100000.vtu displacement displacement
+    expected_cube_1e3_pcs_0_ts_203_t_5.100000.vtu cube_1e3_pcs_0_ts_203_t_5.100000.vtu sigma_xx sigma_xx
+)
+
+# Mechanics; Small deformations, Drucker-Prager (SDE-DP)
+AddTest(
+    NAME Mechanics_PlasticModel_SDE-DP_Ehlers_SpecialCase_DruckerPrager
+    PATH Mechanics/Ehlers
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS cube_1e0_dp.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 5e-15 RELTOL 1e-13
+    DIFF_DATA
+    expected_cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu displacement displacement
+    expected_cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu cube_1e0_dp_pcs_0_ts_203_t_5.100000.vtu sigma_xx sigma_xx
+)
+
+
+# SMALL DEFORMATION TEST -- AXIALLY SYMMETRIC
+AddTest(
+    NAME LARGE_SmallDeformation_ring_plane_strain_axi
+    PATH Mechanics/Linear
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS ring_plane_strain.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 6e-4 RELTOL 1e-4
+    DIFF_DATA
+    ring_plane_strain_1e4_solution.vtu ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu u displacement
+    ring_plane_strain_1e4_solution.vtu ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu sigma_rr sigma_rr
+    ring_plane_strain_1e4_solution.vtu ring_plane_strain_pcs_0_ts_1_t_1.000000.vtu sigma_ff sigma_ff
+)
+
+
diff --git a/ProcessLib/TES/CMakeLists.txt b/ProcessLib/TES/CMakeLists.txt
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bc52ba54cfe073c0c4d30c3dc17bab064a2ff103 100644
--- a/ProcessLib/TES/CMakeLists.txt
+++ b/ProcessLib/TES/CMakeLists.txt
@@ -0,0 +1,106 @@
+# TES tests
+AddTest(
+    NAME TES_zeolite_discharge_small
+    PATH Parabolic/TES/1D
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS tes-1D-zeolite-discharge-small.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-7 RELTOL 5e-9
+    DIFF_DATA
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu pressure pressure
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu temperature temperature
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu vapour_partial_pressure vapour_partial_pressure
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu solid_density solid_density
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0.100000.vtu solid_density fct_solid_density
+)
+
+AddTest(
+    NAME LARGE_TES_zeolite_discharge
+    PATH Parabolic/TES/1D
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-3 RELTOL 1e-4
+    DIFF_DATA
+    tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu pressure pressure
+    tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu temperature temperature
+    tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu vapour_partial_pressure vapour_partial_pressure
+    tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu solid_density solid_density
+    tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1.000000.vtu solid_density fct_solid_density
+)
+
+AddTest(
+    NAME LARGE_TES_zeolite_discharge_Newton
+    PATH Parabolic/TES/1D
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS tes-1D-zeolite-discharge-small-newton.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1.5e-3 RELTOL 1.5e-3
+    DIFF_DATA
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_newton_pcs_0_ts_32_t_0.100000.vtu pressure pressure
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_newton_pcs_0_ts_32_t_0.100000.vtu temperature temperature
+    # tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_newton_pcs_0_ts_32_t_0.100000.vtu vapour_partial_pressure vapour_partial_pressure
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_newton_pcs_0_ts_32_t_0.100000.vtu solid_density solid_density
+)
+
+
+# SQUARE 1x1 TES TEST -- AXIALLY SYMMETRIC
+# test results are compared to 3D simulation on a wedge-shaped domain
+AddTest(
+    NAME LARGE_TES_inert_axi
+    PATH Parabolic/TES/2D
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS tes-inert-axi.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    # Note: Since the temperature and pressure only vary by a factor of ~ 1.e-6 in x-direction
+    # the relative tolerance has to be much smaller than 1.e-6
+    ABSTOL 1e-12 RELTOL 2e-9
+    DIFF_DATA
+    inert-wedge-extracted-surface-t-1s.vtu tes_inert_axi_pcs_0_ts_4_t_1.000000.vtu pressure pressure
+    inert-wedge-extracted-surface-t-1s.vtu tes_inert_axi_pcs_0_ts_4_t_1.000000.vtu temperature temperature
+    inert-wedge-extracted-surface-t-1s.vtu tes_inert_axi_pcs_0_ts_4_t_1.000000.vtu v_mass_frac v_mass_frac
+)
+# # WEDGE 1x1 TES TEST -- computes reference results for the above test
+# AddTest(
+#     NAME TES_inert_wedge
+#     PATH Parabolic/TES/2D
+#     EXECUTABLE ogs
+#     EXECUTABLE_ARGS tes-inert-wedge.prj
+# )
+
+AddTest(
+    NAME TES_zeolite_discharge_small
+    PATH Parabolic/TES/1D
+    EXECUTABLE_ARGS tes-1D-zeolite-discharge-small.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-7 RELTOL 5e-9
+    DIFF_DATA
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu pressure pressure
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu temperature temperature
+    tes_zeolite_discharge_small_ts_19_t_0_100000.vtu tes_zeolite_discharge_small_pcs_0_ts_19_t_0_100000_0.vtu v_mass_frac v_mass_frac
+#        tes_zeolite_discharge_small_ts_19_t_0.100000.vtu solid_density solid_density
+)
+
+AddTest(
+    NAME LARGE_TES_zeolite_discharge
+    PATH Parabolic/TES/1D
+    EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-16 RELTOL 1e-16
+    DIFF_DATA
+    tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu pressure pressure
+    tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu temperature temperature
+    tes_zeolite_discharge_large_ts_28_t_1_000000.vtu tes_zeolite_discharge_large_pcs_0_ts_28_t_1_000000_0.vtu v_mass_frac v_mass_frac
+#        tes_zeolite_discharge_large_ts_28_t_1_0.vtu solid_density solid_density
+)
+
diff --git a/ProcessLib/TwoPhaseFlowWithPP/CMakeLists.txt b/ProcessLib/TwoPhaseFlowWithPP/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b21e3b6008d9bd837cc2964ad2d99a1da90f3fa1
--- /dev/null
+++ b/ProcessLib/TwoPhaseFlowWithPP/CMakeLists.txt
@@ -0,0 +1,26 @@
+AddTest(
+    NAME 2D_TwoPhase_PP_Lia_quad
+    PATH Parabolic/TwoPhaseFlowPP/Liakopoulos
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS Twophase_Lia_quad2_short.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-12
+    DIFF_DATA
+    Lia_20.vtu twophaseflow_pcs_0_ts_119_t_20.000000.vtu capillary_pressure capillary_pressure
+    Lia_20.vtu twophaseflow_pcs_0_ts_119_t_20.000000.vtu gas_pressure gas_pressure
+    Lia_20.vtu twophaseflow_pcs_0_ts_119_t_20.000000.vtu saturation saturation
+)
+AddTest(
+    NAME LARGE_2D_TwoPhase_PP_Lia_quad
+    PATH Parabolic/TwoPhaseFlowPP/Liakopoulos
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS Twophase_Lia_quad2_large.prj
+    TESTER vtkdiff
+    REQUIREMENTS NOT OGS_USE_MPI
+    ABSTOL 1e-8 RELTOL 1e-12
+    DIFF_DATA
+    Lia_1000.vtu twophaseflow_pcs_0_ts_1180_t_1000.000000.vtu capillary_pressure capillary_pressure
+    Lia_1000.vtu twophaseflow_pcs_0_ts_1180_t_1000.000000.vtu gas_pressure gas_pressure
+    Lia_1000.vtu twophaseflow_pcs_0_ts_1180_t_1000.000000.vtu saturation saturation
+)
diff --git a/Tests/Data b/Tests/Data
index 3555525b3e32f64b4c8da396c99d87d5001c0c0a..91c0b08d9c03b1de31f32e008b92a0176857ceab 160000
--- a/Tests/Data
+++ b/Tests/Data
@@ -1 +1 @@
-Subproject commit 3555525b3e32f64b4c8da396c99d87d5001c0c0a
+Subproject commit 91c0b08d9c03b1de31f32e008b92a0176857ceab