diff --git a/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/gravity_driven.gml b/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/gravity_driven.gml
deleted file mode 100644
index a8b51a43f9cbd8ba93358a3a92354ddc6c7be32f..0000000000000000000000000000000000000000
--- a/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/gravity_driven.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e0743dfb69d9b668d7d2f527cf410d4c236fd544f64c5aeb19217d6aa263139
-size 944
diff --git a/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/mesh2D.vtu b/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/mesh2D.vtu
deleted file mode 100644
index fd14dca415d75b7aa688753483a10a9c0d9474b1..0000000000000000000000000000000000000000
--- a/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/mesh2D.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee12aaff41ce544822d1b478644b7e42716d331272c9d1d93831d0e407ad2580
-size 56095
diff --git a/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/thermal_gravity_driven_flow2d.prj b/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/thermal_gravity_driven_flow2d.prj
deleted file mode 100644
index c456f492a57dd9a7b9ae5dcd47350f7e834f987f..0000000000000000000000000000000000000000
--- a/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/thermal_gravity_driven_flow2d.prj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<OpenGeoSysProject>
-    <mesh>mesh2D.vtu</mesh>
-    <geometry>gravity_driven.gml</geometry>
-    <processes>
-        <process>
-            <name>HeatConduction</name>
-            <type>HEAT_CONDUCTION</type>
-            <integration_order>2</integration_order>
-            <thermal_conductivity>lambda</thermal_conductivity>
-            <heat_capacity>c_p</heat_capacity>
-            <density>rho</density>
-            <process_variables>
-                <process_variable>temperature</process_variable>
-            </process_variables>
-            <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
-            </secondary_variables>
-        </process>
-        <process>
-            <name>LiquidFlow</name>
-            <type>LIQUID_FLOW</type>
-            <integration_order>2</integration_order>
-            <darcy_gravity>
-                <!-- axis_id: 0, 1, or the dimension of space minus one -->
-                <axis_id>1</axis_id>
-                <!-- g>=0. g=0: non gravity term -->
-                <g>9.81</g>
-            </darcy_gravity>
-            <process_variables>
-                <process_variable>pressure</process_variable>
-            </process_variables>
-            <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
-            </secondary_variables>
-            <material_property>
-                <fluid>
-                    <density>
-                        <type>TemperatureDependent</type>
-                        <temperature0> 293.0 </temperature0>
-                        <beta> 4.3e-4 </beta>
-                        <rho0>1000.</rho0>
-                    </density>
-                    <viscosity>
-                        <type>Constant</type>
-                        <value> 1.e-3 </value>
-                    </viscosity>
-                    <specific_heat_capacity>
-                        <type>Constant</type>
-                        <value> 4000. </value>
-                    </specific_heat_capacity>
-                    <thermal_conductivity>
-                        <type>Constant</type>
-                        <value> .6 </value>
-                    </thermal_conductivity>
-                </fluid>
-                <porous_medium>
-                    <porous_medium id="0">
-                        <permeability>
-                            <permeability_tensor_entries>kappa1</permeability_tensor_entries>
-                            <type>Constant</type>
-                        </permeability>
-                        <porosity>
-                            <type>Constant</type>
-                            <porosity_parameter>constant_porosity_parameter</porosity_parameter>
-                        </porosity>
-                        <storage>
-                            <type>Constant</type>
-                            <value> 0.0 </value>
-                        </storage>
-                    </porous_medium>
-                </porous_medium>
-                <solid>
-                    <thermal_expansion>solid_thermal_expansion</thermal_expansion>
-                    <biot_constant>biot_const</biot_constant>
-                </solid>
-            </material_property>
-        </process>
-    </processes>
-    <time_loop>
-        <global_process_coupling>
-            <max_iter> 5 </max_iter>
-            <convergence_criterion>
-                <type>Residual</type>
-                <norm_type>NORM2</norm_type>
-                <reltol>1.e-4</reltol>
-            </convergence_criterion>
-        </global_process_coupling>
-        <processes>
-            <process ref="HeatConduction">
-                <nonlinear_solver>basic_picard_T</nonlinear_solver>
-                <convergence_criterion>
-                    <type>DeltaX</type>
-                    <norm_type>NORM2</norm_type>
-                    <abstol>1.e-6</abstol>
-                </convergence_criterion>
-                <time_discretization>
-                    <type>BackwardEuler</type>
-                </time_discretization>
-                <time_stepping>
-                    <type>FixedTimeStepping</type>
-                    <t_initial> 0.0 </t_initial>
-                    <t_end> 300 </t_end>
-                    <timesteps>
-                        <pair>
-                            <repeat>10</repeat>
-                            <delta_t>30</delta_t>
-                        </pair>
-                    </timesteps>
-                </time_stepping>
-                <coupled_processes>
-                    <coupled_process> LiquidFlow </coupled_process>
-                </coupled_processes>
-                <output>
-                    <variables>
-                        <variable> temperature </variable>
-                        <variable> heat_flux_x </variable>
-                    </variables>
-                </output>
-            </process>
-            <process ref="LiquidFlow">
-                <nonlinear_solver>basic_picard_H</nonlinear_solver>
-                <convergence_criterion>
-                    <type>DeltaX</type>
-                    <norm_type>NORM2</norm_type>
-                    <abstol>1.e-6</abstol>
-                </convergence_criterion>
-                <time_discretization>
-                    <type>BackwardEuler</type>
-                </time_discretization>
-                <time_stepping>
-                    <type>FixedTimeStepping</type>
-                    <t_initial> 0.0 </t_initial>
-                    <t_end> 300 </t_end>
-                    <timesteps>
-                        <pair>
-                            <repeat>10</repeat>
-                            <delta_t>30</delta_t>
-                        </pair>
-                    </timesteps>
-                </time_stepping>
-                <coupled_processes>
-                    <coupled_process> HeatConduction </coupled_process>
-                </coupled_processes>
-                <output>
-                    <variables>
-                        <variable> pressure </variable>
-                        <variable> v </variable>
-                    </variables>
-                </output>
-            </process>
-        </processes>
-        <output>
-            <type>VTK</type>
-            <prefix>gravity_driven</prefix>
-            <timesteps>
-                <pair>
-                    <repeat> 1 </repeat>
-                    <each_steps> 5 </each_steps>
-                </pair>
-            </timesteps>
-        </output>
-    </time_loop>
-    <parameters>
-        <parameter>
-            <name>p0</name>
-            <type>Constant</type>
-            <value>1.e+5</value>
-        </parameter>
-        <parameter>
-            <name>p_bc</name>
-            <type>Constant</type>
-            <value>1.e+5</value>
-        </parameter>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>3.0</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1.6e+3</value>
-        </parameter>
-        <parameter>
-            <name>T0</name>
-            <type>Constant</type>
-            <value>293</value>
-        </parameter>
-        <parameter>
-            <name>TB_left</name>
-            <type>Constant</type>
-            <value>373.0</value>
-        </parameter>
-        <parameter>
-            <name>TB_right</name>
-            <type>Constant</type>
-            <value>293.0</value>
-        </parameter>
-        <parameter>
-            <name>solid_thermal_expansion</name>
-            <type>Constant</type>
-            <value>1.e-5</value>
-        </parameter>
-        <parameter>
-            <name>biot_const</name>
-            <type>Constant</type>
-            <value>1.0</value>
-        </parameter>
-        <parameter>
-            <name>kappa1</name>
-            <type>Constant</type>
-            <values>1.e-12</values>
-        </parameter>
-        <parameter>
-            <name>constant_porosity_parameter</name>
-            <type>Constant</type>
-            <value>0.2</value>
-        </parameter>
-    </parameters>
-    <process_variables>
-        <process_variable>
-            <name>temperature</name>
-            <components>1</components>
-            <order>1</order>
-            <initial_condition>T0</initial_condition>
-            <boundary_conditions>
-                <boundary_condition>
-                    <geometrical_set>gravity_dr2D</geometrical_set>
-                    <geometry>right</geometry>
-                    <type>Dirichlet</type>
-                    <parameter>TB_right</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>gravity_dr2D</geometrical_set>
-                    <geometry>left</geometry>
-                    <type>Dirichlet</type>
-                    <parameter>TB_left</parameter>
-                </boundary_condition>
-            </boundary_conditions>
-        </process_variable>
-        <process_variable>
-            <name>pressure</name>
-            <components>1</components>
-            <order>1</order>
-            <initial_condition>p0</initial_condition>
-            <boundary_conditions>
-                <boundary_condition>
-                    <geometrical_set>gravity_dr2D</geometrical_set>
-                    <geometry>top</geometry>
-                    <type>Dirichlet</type>
-                    <parameter>p_bc</parameter>
-                </boundary_condition>
-            </boundary_conditions>
-        </process_variable>
-    </process_variables>
-    <nonlinear_solvers>
-        <nonlinear_solver>
-            <name>basic_picard_T</name>
-            <type>Picard</type>
-            <max_iter>10</max_iter>
-            <linear_solver>linear_solver_T</linear_solver>
-        </nonlinear_solver>
-        <nonlinear_solver>
-            <name>basic_picard_H</name>
-            <type>Picard</type>
-            <max_iter>10</max_iter>
-            <linear_solver>linear_solver_H</linear_solver>
-        </nonlinear_solver>
-    </nonlinear_solvers>
-    <linear_solvers>
-        <linear_solver>
-            <name>linear_solver_T</name>
-            <lis>-i cg -p jacobi -tol 1e-20 -maxiter 10000</lis>
-            <eigen>
-                <solver_type>BiCGSTAB</solver_type>
-                <precon_type>DIAGONAL</precon_type>
-                <max_iteration_step>10000</max_iteration_step>
-                <error_tolerance>1e-20</error_tolerance>
-            </eigen>
-            <petsc>
-                <prefix>T</prefix>
-                <parameters>-T_ksp_type bcgs -T_pc_type bjacobi -T_ksp_rtol 1e-16 -T_ksp_max_it 10000</parameters>
-            </petsc>
-        </linear_solver>
-        <linear_solver>
-            <name>linear_solver_H</name>
-            <lis>-i cg -p jacobi -tol 1e-20 -maxiter 10000</lis>
-            <eigen>
-                <solver_type>CG</solver_type>
-                <precon_type>DIAGONAL</precon_type>
-                <max_iteration_step>10000</max_iteration_step>
-                <error_tolerance>1e-20</error_tolerance>
-            </eigen>
-            <petsc>
-                <prefix>H</prefix>
-                <parameters>-H_ksp_type cg -H_pc_type bjacobi -H_ksp_rtol 1e-16 -H_ksp_max_it 10000</parameters>
-            </petsc>
-        </linear_solver>
-    </linear_solvers>
-</OpenGeoSysProject>
diff --git a/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/thermal_gravity_driven_flow2d_adaptive_dt.prj b/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/thermal_gravity_driven_flow2d_adaptive_dt.prj
deleted file mode 100644
index 8f34a6fbb5c89d97703aee04e0ccfbe4b45212c7..0000000000000000000000000000000000000000
--- a/Tests/Data/StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D/thermal_gravity_driven_flow2d_adaptive_dt.prj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<OpenGeoSysProject>
-    <mesh>mesh2D.vtu</mesh>
-    <geometry>gravity_driven.gml</geometry>
-    <processes>
-        <process>
-            <name>HeatConduction</name>
-            <type>HEAT_CONDUCTION</type>
-            <integration_order>2</integration_order>
-            <thermal_conductivity>lambda</thermal_conductivity>
-            <heat_capacity>c_p</heat_capacity>
-            <density>rho</density>
-            <process_variables>
-                <process_variable>temperature</process_variable>
-            </process_variables>
-            <secondary_variables>
-                <secondary_variable type="static" internal_name="heat_flux_x" output_name="heat_flux_x"/>
-            </secondary_variables>
-        </process>
-        <process>
-            <name>LiquidFlow</name>
-            <type>LIQUID_FLOW</type>
-            <integration_order>2</integration_order>
-            <darcy_gravity>
-                <!-- axis_id: 0, 1, or the dimension of space minus one -->
-                <axis_id>1</axis_id>
-                <!-- g>=0. g=0: non gravity term -->
-                <g>9.81</g>
-            </darcy_gravity>
-            <process_variables>
-                <process_variable>pressure</process_variable>
-            </process_variables>
-            <secondary_variables>
-                <secondary_variable type="static" internal_name="darcy_velocity" output_name="v"/>
-            </secondary_variables>
-            <material_property>
-                <fluid>
-                    <density>
-                        <type>TemperatureDependent</type>
-                        <temperature0> 293.0 </temperature0>
-                        <beta> 4.3e-4 </beta>
-                        <rho0>1000.</rho0>
-                    </density>
-                    <viscosity>
-                        <type>Constant</type>
-                        <value> 1.e-3 </value>
-                    </viscosity>
-                    <specific_heat_capacity>
-                        <type>Constant</type>
-                        <value> 4000. </value>
-                    </specific_heat_capacity>
-                    <thermal_conductivity>
-                        <type>Constant</type>
-                        <value> .6 </value>
-                    </thermal_conductivity>
-                </fluid>
-                <porous_medium>
-                    <porous_medium id="0">
-                        <permeability>
-                            <permeability_tensor_entries>kappa1</permeability_tensor_entries>
-                            <type>Constant</type>
-                        </permeability>
-                        <porosity>
-                            <type>Constant</type>
-                            <porosity_parameter>constant_porosity_parameter</porosity_parameter>
-                        </porosity>
-                        <storage>
-                            <type>Constant</type>
-                            <value> 0.0 </value>
-                        </storage>
-                    </porous_medium>
-                </porous_medium>
-                <solid>
-                    <thermal_expansion>solid_thermal_expansion</thermal_expansion>
-                    <biot_constant>biot_const</biot_constant>
-                </solid>
-            </material_property>
-        </process>
-    </processes>
-    <time_loop>
-        <global_process_coupling>
-            <max_iter> 5 </max_iter>
-            <convergence_criterion>
-                <type>Residual</type>
-                <norm_type>NORM2</norm_type>
-                <reltol>1.e-4</reltol>
-            </convergence_criterion>
-        </global_process_coupling>
-        <processes>
-            <process ref="HeatConduction">
-                <nonlinear_solver>basic_picard_T</nonlinear_solver>
-                <convergence_criterion>
-                    <type>DeltaX</type>
-                    <norm_type>NORM2</norm_type>
-                    <abstol>1.e-6</abstol>
-                </convergence_criterion>
-                <time_discretization>
-                    <type>BackwardEuler</type>
-                </time_discretization>
-                <time_stepping>
-                    <type>EvolutionaryPIDcontroller</type>
-                    <t_initial> 0.0 </t_initial>
-                    <t_end> 300 </t_end>
-                    <dt_guess> 5 </dt_guess>
-                    <dt_min> 0.1 </dt_min>
-                    <dt_max> 50 </dt_max>
-                    <rel_dt_min> 0.01 </rel_dt_min>
-                    <rel_dt_max> 5 </rel_dt_max>
-                    <tol> 1.e-1 </tol>
-                </time_stepping>
-                <coupled_processes>
-                    <coupled_process> LiquidFlow </coupled_process>
-                </coupled_processes>
-                <output>
-                    <variables>
-                        <variable> temperature </variable>
-                        <variable> heat_flux_x </variable>
-                    </variables>
-                </output>
-            </process>
-            <process ref="LiquidFlow">
-                <nonlinear_solver>basic_picard_H</nonlinear_solver>
-                <convergence_criterion>
-                    <type>DeltaX</type>
-                    <norm_type>NORM2</norm_type>
-                    <abstol>1.e-6</abstol>
-                </convergence_criterion>
-                <time_discretization>
-                    <type>BackwardEuler</type>
-                </time_discretization>
-                <time_stepping>
-                    <type>EvolutionaryPIDcontroller</type>
-                    <t_initial> 0.0 </t_initial>
-                    <t_end> 300 </t_end>
-                    <dt_guess> 5 </dt_guess>
-                    <dt_min> 0.1 </dt_min>
-                    <dt_max> 50 </dt_max>
-                    <rel_dt_min> 0.01 </rel_dt_min>
-                    <rel_dt_max> 5 </rel_dt_max>
-                    <tol> 0.5 </tol>
-                </time_stepping>
-                <coupled_processes>
-                    <coupled_process> HeatConduction </coupled_process>
-                </coupled_processes>
-                <output>
-                    <variables>
-                        <variable> pressure </variable>
-                        <variable> v </variable>
-                    </variables>
-                </output>
-            </process>
-        </processes>
-        <output>
-            <type>VTK</type>
-            <prefix>gravity_driven_adaptive_dt</prefix>
-            <timesteps>
-                <pair>
-                    <repeat> 1 </repeat>
-                    <each_steps> 5 </each_steps>
-                </pair>
-            </timesteps>
-        </output>
-    </time_loop>
-    <parameters>
-        <parameter>
-            <name>p0</name>
-            <type>Constant</type>
-            <value>1.e+5</value>
-        </parameter>
-        <parameter>
-            <name>p_bc</name>
-            <type>Constant</type>
-            <value>1.e+5</value>
-        </parameter>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>3.0</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1.6e+3</value>
-        </parameter>
-        <parameter>
-            <name>T0</name>
-            <type>Constant</type>
-            <value>293</value>
-        </parameter>
-        <parameter>
-            <name>TB_left</name>
-            <type>Constant</type>
-            <value>373.0</value>
-        </parameter>
-        <parameter>
-            <name>TB_right</name>
-            <type>Constant</type>
-            <value>293.0</value>
-        </parameter>
-        <parameter>
-            <name>solid_thermal_expansion</name>
-            <type>Constant</type>
-            <value>1.e-5</value>
-        </parameter>
-        <parameter>
-            <name>biot_const</name>
-            <type>Constant</type>
-            <value>1.0</value>
-        </parameter>
-        <parameter>
-            <name>kappa1</name>
-            <type>Constant</type>
-            <values>1.e-12</values>
-        </parameter>
-        <parameter>
-            <name>constant_porosity_parameter</name>
-            <type>Constant</type>
-            <value>0.2</value>
-        </parameter>
-    </parameters>
-    <process_variables>
-        <process_variable>
-            <name>temperature</name>
-            <components>1</components>
-            <order>1</order>
-            <initial_condition>T0</initial_condition>
-            <boundary_conditions>
-                <boundary_condition>
-                    <geometrical_set>gravity_dr2D</geometrical_set>
-                    <geometry>right</geometry>
-                    <type>Dirichlet</type>
-                    <parameter>TB_right</parameter>
-                </boundary_condition>
-                <boundary_condition>
-                    <geometrical_set>gravity_dr2D</geometrical_set>
-                    <geometry>left</geometry>
-                    <type>Dirichlet</type>
-                    <parameter>TB_left</parameter>
-                </boundary_condition>
-            </boundary_conditions>
-        </process_variable>
-        <process_variable>
-            <name>pressure</name>
-            <components>1</components>
-            <order>1</order>
-            <initial_condition>p0</initial_condition>
-            <boundary_conditions>
-                <boundary_condition>
-                    <geometrical_set>gravity_dr2D</geometrical_set>
-                    <geometry>top</geometry>
-                    <type>Dirichlet</type>
-                    <parameter>p_bc</parameter>
-                </boundary_condition>
-            </boundary_conditions>
-        </process_variable>
-    </process_variables>
-    <nonlinear_solvers>
-        <nonlinear_solver>
-            <name>basic_picard_T</name>
-            <type>Picard</type>
-            <max_iter>10</max_iter>
-            <linear_solver>linear_solver_T</linear_solver>
-        </nonlinear_solver>
-        <nonlinear_solver>
-            <name>basic_picard_H</name>
-            <type>Picard</type>
-            <max_iter>10</max_iter>
-            <linear_solver>linear_solver_H</linear_solver>
-        </nonlinear_solver>
-    </nonlinear_solvers>
-    <linear_solvers>
-        <linear_solver>
-            <name>linear_solver_T</name>
-            <lis>-i cg -p jacobi -tol 1e-20 -maxiter 10000</lis>
-            <eigen>
-                <solver_type>BiCGSTAB</solver_type>
-                <precon_type>DIAGONAL</precon_type>
-                <max_iteration_step>10000</max_iteration_step>
-                <error_tolerance>1e-20</error_tolerance>
-            </eigen>
-            <petsc>
-                <prefix>T</prefix>
-                <parameters>-T_ksp_type bcgs -T_pc_type bjacobi -T_ksp_rtol 1e-16 -T_ksp_max_it 10000</parameters>
-            </petsc>
-        </linear_solver>
-        <linear_solver>
-            <name>linear_solver_H</name>
-            <lis>-i cg -p jacobi -tol 1e-20 -maxiter 10000</lis>
-            <eigen>
-                <solver_type>CG</solver_type>
-                <precon_type>DIAGONAL</precon_type>
-                <max_iteration_step>10000</max_iteration_step>
-                <error_tolerance>1e-20</error_tolerance>
-            </eigen>
-            <petsc>
-                <prefix>H</prefix>
-                <parameters>-H_ksp_type cg -H_pc_type bjacobi -H_ksp_rtol 1e-16 -H_ksp_max_it 10000</parameters>
-            </petsc>
-        </linear_solver>
-    </linear_solvers>
-</OpenGeoSysProject>