diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake
index f476a07b8727d316aa7f3619656a18c0f0107e3a..ea7fb182a8eaefacc6d8a20d47bc80bc17904a20 100644
--- a/Applications/Utils/Tests.cmake
+++ b/Applications/Utils/Tests.cmake
@@ -10,7 +10,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_MapGeometryToMeshSurface_Bode
+    NAME MapGeometryToMeshSurface_Bode
     PATH MeshGeoToolsLib/Bode
     EXECUTABLE MapGeometryToMeshSurface
     EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml
@@ -20,7 +20,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_MapGeometryToMeshSurface_Naegelstedt
+    NAME MapGeometryToMeshSurface_Naegelstedt
     PATH MeshGeoToolsLib/Naegelstedt
     EXECUTABLE MapGeometryToMeshSurface
     EXECUTABLE_ARGS -m SmallTest.vtu -i RiverNetwork.gml -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Naegelstedt/RiverNetwork-Mapped.gml
diff --git a/ProcessLib/GroundwaterFlow/Tests.cmake b/ProcessLib/GroundwaterFlow/Tests.cmake
index 7542b758902811b56ad24475cf0dbafa9bd53a38..1fe6320d2050430a132ef9f4266997577c78f97d 100644
--- a/ProcessLib/GroundwaterFlow/Tests.cmake
+++ b/ProcessLib/GroundwaterFlow/Tests.cmake
@@ -35,8 +35,11 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
 endforeach()
 
 foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
+    if("${mesh_size}" STREQUAL "1e6")
+        set(benchmark_type LARGE_)
+    endif()
     AddTest(
-        NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
+        NAME ${benchmark_type}GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
         PATH Elliptic/cube_1x1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}.prj
@@ -47,7 +50,7 @@ foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
     )
 
     AddTest(
-        NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
+        NAME ${benchmark_type}GroundWaterFlowProcess_cube_1x1x1_Neumann_${mesh_size}
         PATH Elliptic/cube_1x1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS cube_${mesh_size}_neumann.prj
@@ -98,8 +101,11 @@ foreach(mesh_size 1e0 1e1 1e2 1e3 1e4)
 endforeach()
 
 foreach(mesh_size 1e5 1e6)
+    if("${mesh_size}" STREQUAL "1e6")
+        set(benchmark_type LARGE_)
+    endif()
     AddTest(
-        NAME LARGE_GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
+        NAME ${benchmark_type}GroundWaterFlowProcess_square_1x1_Neumann_${mesh_size}
         PATH Elliptic/square_1x1_GroundWaterFlow
         EXECUTABLE ogs
         EXECUTABLE_ARGS square_${mesh_size}_neumann.prj
@@ -425,7 +431,7 @@ foreach(mesh_size 1e0 1e1 1e2 1e3)
     )
 endforeach()
 
-
+# TODO: Parallel LARGE tests not tested!
 foreach(mesh_size 1e4 2e4 3e4 4e4 5e4 1e5 1e6)
     AddTest(
         NAME LARGE_GroundWaterFlowProcess_cube_1x1x1_${mesh_size}
@@ -611,7 +617,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_GroundWaterFlowProcess_NodalSourceTerm_circle_1e5
+    NAME GroundWaterFlowProcess_NodalSourceTerm_circle_1e5
     PATH Elliptic/circle_radius_1
     EXECUTABLE ogs
     EXECUTABLE_ARGS circle_1e5_axi.prj
@@ -645,7 +651,7 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
     DIFF_DATA
-    square_1x1_quad_1e6_nodal_sources_expected.vtu square_1e6_pcs_0_ts_1_t_1.000000.vtu analytical_solution pressure 1.41 1e-16
-    VIS square_1e6_pcs_0_ts_1_t_1.000000.vtu
+    square_1x1_quad_1e6_nodal_sources_expected.vtu square_1e6__with_nodal_sources_pcs_0_ts_1_t_1.000000.vtu analytical_solution pressure 1.41 1e-16
+    VIS square_1e6__nodal_sources_expected_pcs_0_ts_1_t_1.000000.vtu
 )
 
diff --git a/ProcessLib/HT/Tests.cmake b/ProcessLib/HT/Tests.cmake
index 4036ed06b3321decafba92b098eb40121d8cfe5a..73941f44bc17bc61bd7a39392dd21b76bca1f2f3 100644
--- a/ProcessLib/HT/Tests.cmake
+++ b/ProcessLib/HT/Tests.cmake
@@ -357,8 +357,8 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA
-    GLOB ConstViscosityThermalConvection_pcs_0_ts_*.vtu T T 1e-14 1e-13
-    GLOB ConstViscosityThermalConvection_pcs_0_ts_*.vtu p p 1e-15 1e-14
+    GLOB constraint_bc_1e3_pcs_0_ts_*.vtu T T 1e-14 1e-13
+    GLOB constraint_bc_1e3_pcs_0_ts_*.vtu p p 1e-15 1e-14
 )
 
 # MPI/PETSc tests
@@ -382,7 +382,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_2D_ThermalConvection_constviscosityStaggeredScheme
+    NAME Parallel_LARGE_2D_ThermalConvection_constviscosityStaggeredScheme
     PATH Parabolic/HT/StaggeredCoupling/ConstViscosity
     EXECUTABLE_ARGS square_5500x5500_staggered_scheme.prj
     WRAPPER mpirun
diff --git a/ProcessLib/HeatConduction/Tests.cmake b/ProcessLib/HeatConduction/Tests.cmake
index f7a13ba7e8ca971ee0570fb69159ac8377aafcc9..42874e37d524b10ee94cc6556f6faffb51555c13 100644
--- a/ProcessLib/HeatConduction/Tests.cmake
+++ b/ProcessLib/HeatConduction/Tests.cmake
@@ -46,7 +46,7 @@ AddTest(
 # The 25 BHE array benchmark
 # test results are compared to 2D simulation result
 AddTest(
-    NAME BHE_Array_2D
+    NAME LARGE_BHE_Array_2D
     PATH Parabolic/T/2D_BHE_array
     EXECUTABLE ogs
     EXECUTABLE_ARGS bhe2d.prj
diff --git a/ProcessLib/LIE/HydroMechanics/Tests.cmake b/ProcessLib/LIE/HydroMechanics/Tests.cmake
index 10a9bcac462e31848259d931468dfdd886e4c8c8..afd9888dc8682cf260db2fbc9a8bd620f0ee3c67 100644
--- a/ProcessLib/LIE/HydroMechanics/Tests.cmake
+++ b/ProcessLib/LIE/HydroMechanics/Tests.cmake
@@ -53,7 +53,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LIE_HM_TaskB
+    NAME LARGE_LIE_HM_TaskB
     PATH LIE/HydroMechanics
     EXECUTABLE ogs
     EXECUTABLE_ARGS TaskB.prj
diff --git a/ProcessLib/PhaseField/Tests.cmake b/ProcessLib/PhaseField/Tests.cmake
index b7a8a39025b91538779cdcb582d6be52065d72f8..df50a974a8fd17df46b55280952c728f7a312d6d 100644
--- a/ProcessLib/PhaseField/Tests.cmake
+++ b/ProcessLib/PhaseField/Tests.cmake
@@ -25,7 +25,7 @@ AddTest(
    )
 
 AddTest(
-    NAME PhaseField_3D_beam_LARGE
+    NAME PhaseField_3D_beam
     PATH PhaseField
     EXECUTABLE ogs
     EXECUTABLE_ARGS beam3d_stag_1pcs.prj
diff --git a/ProcessLib/SmallDeformation/Tests.cmake b/ProcessLib/SmallDeformation/Tests.cmake
index b2849c3d7442e7e33177f8dfca7bb35236e76e21..75970c97317dc22b627eb76b4aa71988b328ad07 100644
--- a/ProcessLib/SmallDeformation/Tests.cmake
+++ b/ProcessLib/SmallDeformation/Tests.cmake
@@ -22,7 +22,7 @@ AddTest(
     square_1e2_expected_pcs_0_ts_4_t_1.000000.vtu square_1e2_pcs_0_ts_4_t_1.000000.vtu sigma sigma 1e-15 0
 )
 AddTest(
-    NAME LARGE_Mechanics_SDL_disc_with_hole
+    NAME Mechanics_SDL_disc_with_hole
     PATH Mechanics/Linear
     EXECUTABLE ogs
     EXECUTABLE_ARGS disc_with_hole.prj
@@ -40,8 +40,8 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT OGS_USE_MPI
     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 1e-16 1e-16
-    square_1e5_expected_pcs_0_ts_4_t_1.000000.vtu square_1e5_pcs_0_ts_4_t_1.000000.vtu sigma sigma 1e-16 1e-16
+    square_1e5_expected_pcs_0_ts_4_t_1.000000.vtu square_1e5_pcs_0_ts_4_t_1.000000.vtu displacement displacement 1e-15 0
+    square_1e5_expected_pcs_0_ts_4_t_1.000000.vtu square_1e5_pcs_0_ts_4_t_1.000000.vtu sigma sigma 1e-13 0
 )
 AddTest(
     NAME Mechanics_SDL_square_1e2_quad8_traction_topBC
diff --git a/ProcessLib/TES/Tests.cmake b/ProcessLib/TES/Tests.cmake
index 088fc03fede2a3d4e1928348233b1d510141ebf4..e581415fca36efa1e13be18dd9867b71bb350467 100644
--- a/ProcessLib/TES/Tests.cmake
+++ b/ProcessLib/TES/Tests.cmake
@@ -14,7 +14,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_TES_zeolite_discharge
+    NAME TES_zeolite_discharge
     PATH Parabolic/TES/1D
     EXECUTABLE ogs
     EXECUTABLE_ARGS tes-1D-zeolite-discharge-large.prj
@@ -28,7 +28,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_TES_zeolite_discharge_Newton
+    NAME TES_zeolite_discharge_Newton
     PATH Parabolic/TES/1D
     EXECUTABLE ogs
     EXECUTABLE_ARGS tes-1D-zeolite-discharge-small-newton.prj
@@ -45,7 +45,7 @@ AddTest(
 # SQUARE 1x1 TES TEST -- AXIALLY SYMMETRIC
 # test results are compared to 3D simulation on a wedge-shaped domain
 AddTest(
-    NAME LARGE_TES_inert_axi
+    NAME TES_inert_axi
     PATH Parabolic/TES/2D
     EXECUTABLE ogs
     EXECUTABLE_ARGS tes-inert-axi.prj
diff --git a/ProcessLib/ThermoMechanics/Tests.cmake b/ProcessLib/ThermoMechanics/Tests.cmake
index e98d0eb746589288157970cc66cc990d518744e9..fb2f56f83c381bd0d0e3c5cf1b1ca8f471b685a9 100644
--- a/ProcessLib/ThermoMechanics/Tests.cmake
+++ b/ProcessLib/ThermoMechanics/Tests.cmake
@@ -15,7 +15,7 @@ AddTest(
 )
 
 AddTest(
-    NAME LARGE_2D_ThermoElastic_IGLU_Plane_Strain
+    NAME 2D_ThermoElastic_IGLU_Plane_Strain
     PATH ThermoMechanics
     EXECUTABLE ogs
     EXECUTABLE_ARGS iglu_quarter_plane_strain.prj
@@ -23,11 +23,11 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
     DIFF_DATA
-    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu displacement displacement 5e-11 1e-15
-    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu temperature temperature 5e-11 1e-15
-    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu sigma_xx sigma_xx 5e-11 1e-15
-    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu sigma_yy sigma_yy 5e-11 1e-15
-    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu sigma_zz sigma_zz 5e-11 1e-15
+    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu displacement displacement 1e-9 1e-15
+    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu temperature temperature 2e-6 1e-15
+    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu sigma_xx sigma_xx 5e-6 1e-15
+    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu sigma_yy sigma_yy 5e-6 1e-15
+    expected_tm_q_pcs_0_ts_20_t_20000.000000.vtu tm_q_pcs_0_ts_20_t_20000.000000.vtu sigma_zz sigma_zz 5e-6 1e-15
 )
 
 AddTest(
@@ -55,15 +55,15 @@ AddTest(
     TESTER vtkdiff
     REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
     DIFF_DATA
-    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu displacement displacement 5e-11 1e-15
-    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu temperature temperature 5e-11 1e-15
-    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu sigma_xx sigma_xx 5e-11 1e-15
-    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu sigma_yy sigma_yy 5e-11 1e-15
-    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu sigma_zz sigma_zz 5e-11 1e-15
+    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu displacement displacement 5e-10 1e-15
+    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu temperature temperature 2e-6 1e-15
+    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu sigma_xx sigma_xx 5e-6 0
+    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu sigma_yy sigma_yy 6e-6 0
+    expected_tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu tm_q_quad_pcs_0_ts_20_t_20000.000000.vtu sigma_zz sigma_zz 5e-6 0
 )
 
 AddTest(
-    NAME LARGE_2D_ThermoElastic_IGLU_Axisymmetric_Plane_Strain_Quadratic_Mesh
+    NAME 2D_ThermoElastic_IGLU_Axisymmetric_Plane_Strain_Quadratic_Mesh
     PATH ThermoMechanics
     EXECUTABLE ogs
     EXECUTABLE_ARGS iglu_axisymmetric_plane_strain_quad.prj
diff --git a/ProcessLib/TwoPhaseFlowWithPP/Tests.cmake b/ProcessLib/TwoPhaseFlowWithPP/Tests.cmake
index 9237b9cdb728f20eaf3313149203529e2b45f561..fcad7ebf8966aa706b8a49d1f562087107a5b2e8 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/Tests.cmake
+++ b/ProcessLib/TwoPhaseFlowWithPP/Tests.cmake
@@ -20,7 +20,7 @@ AddTest(
     h2_Liako_20.vtu twophaseflow_pcs_0_ts_218_t_20.000000.vtu gas_pressure gas_pressure 20 1e-3
 )
 AddTest(
-    NAME LARGE_2D_TwoPhase_PP_Lia_quad_1
+    NAME 2D_TwoPhase_PP_Lia_quad_1_lg
     PATH Parabolic/TwoPhaseFlowPP/Liakopoulos
     EXECUTABLE ogs
     EXECUTABLE_ARGS TwoPhase_Lia_quad_large.prj
@@ -30,7 +30,7 @@ AddTest(
     h2_Liako_1198.vtu twophaseflow_pcs_0_ts_1198_t_1000.000000.vtu SATURATION1 saturation 1e-2 1e-3
 )
 AddTest(
-    NAME LARGE_2D_TwoPhase_PP_Lia_quad_2
+    NAME 2D_TwoPhase_PP_Lia_quad_2_lg
     PATH Parabolic/TwoPhaseFlowPP/Liakopoulos
     EXECUTABLE ogs
     EXECUTABLE_ARGS TwoPhase_Lia_quad_large.prj
diff --git a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
index 1ee4452324c680028c156c8aea921a2cd5f17dc4..b33d408f85cce5d4622079f44d3d4204081e6765 100644
--- a/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
+++ b/Tests/Data/Elliptic/square_1x1_GroundWaterFlow/square_1e6_with_nodal_sources.prj
@@ -41,7 +41,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>square_1e6</prefix>
+            <prefix>square_1e6_with_nodal_sources</prefix>
         </output>
     </time_loop>
     <parameters>
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder.gml b/Tests/Data/Parabolic/ComponentTransport/elder/elder.gml
index 9d3c6f21888d9911bfd6ef66abf8640a6f98f816..260d2e9569dd3825450200f39039da30f1ebb5a7 100644
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder.gml
+++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder.gml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:311e3b36b62e2009f57d1904f188478443bbb7afbf40a8756dfdfdafd7383908
-size 1509
+oid sha256:673bfc0302892d4289a2a6d99dba47c9678269c1f27a98d720e813f0961c0a78
+size 1542
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
index e6c4b091c1575c3eb13d138b5662f7455c371f49..2c59912501d6a35f18462153dd82b0d7c69aaca6 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
@@ -2,6 +2,10 @@
 <OpenGeoSysProject>
     <mesh>goswami_input_xy_tri_kappa_ini_MatID.vtu</mesh>
     <geometry>goswami_input.gml</geometry>
+    <search_length_algorithm>
+        <type>fixed</type>
+        <value>1e-3</value>
+    </search_length_algorithm>
     <processes>
         <process>
             <name>ComponentTransport</name>
@@ -221,20 +225,12 @@
                 <boundary_condition>
                     <geometrical_set>goswami_mesh</geometrical_set>
                     <geometry>left</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-3</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <parameter>c_Dirichlet_left</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>goswami_mesh</geometrical_set>
                     <geometry>right</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-3</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <parameter>c_Dirichlet_right</parameter>
                 </boundary_condition>
@@ -249,20 +245,12 @@
                 <boundary_condition>
                     <geometrical_set>goswami_mesh</geometrical_set>
                     <geometry>topleft</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-3</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_topleft</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>goswami_mesh</geometrical_set>
                     <geometry>topright</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-3</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <parameter>p_Dirichlet_topright</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
index e76ad2b33bbaddaf405b03e57a37414e3c5a2895..18b5a45c07795f4c4e259329d6eb247ff93a48c3 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
@@ -111,7 +111,7 @@
         </processes>
         <output>
             <type>VTK</type>
-            <prefix>ConstViscosityThermalConvection</prefix>
+            <prefix>constraint_bc_1e3</prefix>
             <timesteps>
                 <pair>
                     <repeat> 10 </repeat>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_0_t_0.000000.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_0_t_0.000000.vtu
similarity index 100%
rename from Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_0_t_0.000000.vtu
rename to Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_0_t_0.000000.vtu
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_1_t_0.000000.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_1_t_0.000000.vtu
similarity index 100%
rename from Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_1_t_0.000000.vtu
rename to Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_1_t_0.000000.vtu
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_2_t_0.000010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_2_t_0.000010.vtu
similarity index 100%
rename from Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_2_t_0.000010.vtu
rename to Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_2_t_0.000010.vtu
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_3_t_0.001010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_3_t_0.001010.vtu
similarity index 100%
rename from Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_3_t_0.001010.vtu
rename to Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_3_t_0.001010.vtu
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_4_t_0.101010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_4_t_0.101010.vtu
similarity index 100%
rename from Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_4_t_0.101010.vtu
rename to Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_4_t_0.101010.vtu
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_5_t_1.101010.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_5_t_1.101010.vtu
similarity index 100%
rename from Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_5_t_1.101010.vtu
rename to Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_5_t_1.101010.vtu
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_6_t_10.000000.vtu b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_6_t_10.000000.vtu
similarity index 100%
rename from Tests/Data/Parabolic/HT/SimpleSynthetics/ConstViscosityThermalConvection_pcs_0_ts_6_t_10.000000.vtu
rename to Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3_pcs_0_ts_6_t_10.000000.vtu
diff --git a/Tests/Data/ThermoMechanicalPhaseField/tes_hx3_iglu.prj b/Tests/Data/ThermoMechanicalPhaseField/tes_hx3_iglu.prj
index d02260532ef9c8d70d0120905c1357211d835027..246d29a5db3e8b5ec44b1f51f9e01ded59912dbd 100644
--- a/Tests/Data/ThermoMechanicalPhaseField/tes_hx3_iglu.prj
+++ b/Tests/Data/ThermoMechanicalPhaseField/tes_hx3_iglu.prj
@@ -2,6 +2,10 @@
 <OpenGeoSysProject>
     <mesh axially_symmetric="true">tes_hx3.vtu</mesh>
     <geometry>tes_hx3.gml</geometry>
+    <search_length_algorithm>
+        <type>fixed</type>
+        <value>1e-6</value>
+    </search_length_algorithm>
     <processes>
         <process>
             <name>ThermoMechanicalPhaseField</name>
@@ -369,30 +373,18 @@
                 <boundary_condition>
                     <geometrical_set>square_1x1_geometry</geometrical_set>
                     <geometry>rightl</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-6</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <parameter>temperature_bc</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>square_1x1_geometry</geometrical_set>
                     <geometry>rightm</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-6</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <parameter>temperature_bc</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>square_1x1_geometry</geometrical_set>
                     <geometry>rightu</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-6</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <parameter>temperature_bc</parameter>
                 </boundary_condition>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
index 40514b1a6e6d7af74becf85af9ef27b456dde415..3c45b7704cd447b717ba4d711f3f24dd9d058cb8 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
@@ -2,6 +2,10 @@
 <OpenGeoSysProject>
     <mesh>tm_q.vtu</mesh>
     <geometry>quarter_group.gml</geometry>
+    <search_length_algorithm>
+        <type>fixed</type>
+        <value>1e-6</value>
+    </search_length_algorithm>
     <processes>
         <process>
             <name>ThermoMechanics</name>
@@ -216,10 +220,6 @@
                 <boundary_condition>
                     <geometrical_set>square_1x1_geometry</geometrical_set>
                     <geometry>in</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-6</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>temperature_bc</parameter>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
index 197363735cb9c794b53aea0d8269ae7f1e4e1e08..0561095ba9eb9d44a628ad9e7bdfe26de623ed79 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
@@ -2,6 +2,10 @@
 <OpenGeoSysProject>
     <mesh>tm_q_quad.vtu</mesh>
     <geometry>quarter_group.gml</geometry>
+    <search_length_algorithm>
+        <type>fixed</type>
+        <value>1e-6</value>
+    </search_length_algorithm>
     <processes>
         <process>
             <name>ThermoMechanics</name>
@@ -216,10 +220,6 @@
                 <boundary_condition>
                     <geometrical_set>square_1x1_geometry</geometrical_set>
                     <geometry>in</geometry>
-                    <search_length_algorithm>
-                        <type>fixed</type>
-                        <value>1e-6</value>
-                    </search_length_algorithm>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>temperature_bc</parameter>