diff --git a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
index cc6eb9a353738b7a54fd437bf51ae9f639eaa235..3dfdd634f769172c7405d06926f76b5f1e384ad2 100644
--- a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
+++ b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
@@ -11,22 +11,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
index 5bdea279349dced7f1e2e15c41fa4a0925c5cc63..2af8acc7a927f9f0385fef81766ca4770dc8b1df 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
@@ -11,22 +11,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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</value>
- </storage>
- </porous_medium>
- </porous_medium>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
index 481b63701a0e957525fb747e6cf59cd97aa5599a..afe28e114b0bbb22422cf27f2f12761f8ccb07ad 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
@@ -12,22 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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</value>
- </storage>
- </porous_medium>
- </porous_medium>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
index d2a233d91a0a4f1b53fb4915b32ecee1e8ec7766..69448810b5f5388ed1bd7532a483e44d5a5b340d 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
@@ -11,22 +11,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
index 981a8c7f3b18d8a31eaebb44eb2d0186f50fb51c..371343b3bb0a66c4fdf99247574616798b85a5de 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
@@ -12,22 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
index 96015d5a6d76c6480f5a201ace13314e356d5b16..b96c6593dad025718dc4f071c8a88381123fa209 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
@@ -11,22 +11,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
index 5a284030328af206449324ad72b5df87e688448d..2ef872e46b2daa56f3b65acfe6047ecd0667617d 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
@@ -12,22 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
index 3cc181708c9cb6f0b5d5909883668af94d426ff6..afed1f5d85e22ab2196bde1f5734a6d7035ad712 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
@@ -11,22 +11,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
index 7f49ad1e3b13e2ed8a12376998146c4e32e4012d..f14257888f37b6dd74ef2da31c8df604babfe18b 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
@@ -12,22 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
index b802cb3397b61e1e8b11f024ae1c21d8727a05df..48f91d282534691272ba1d33b6fe9d866d65c6c4 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
@@ -11,22 +11,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
index f0faaef6caaf539af4d888588f48f7d3c76844a6..2c0e4c44abe313ea7bc5798b289d9de1d4640a07 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
@@ -12,22 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>1e-5</value>
- </storage>
- </porous_medium>
- </porous_medium>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
index 6c594984f35ebae0cd76fad8ddff2b6ec6d6d7d9..a6ad7c67563fa50dc2d79e94ad19f6c6389cfb82 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
@@ -15,22 +15,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
index 876f0fd4b12fc20719c4756bea520eca175bdb17..6bdbe6815e6f82c6b00df446999ae082b0820084 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
@@ -15,22 +15,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
index dde2230c743196e776337e3deb761e7e1bc981bd..355f04a1b2b8784e4d376d6600505a262a7e6598 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
@@ -11,22 +11,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
index e62fc655d66251bc5a64e400385067e0ce215c9a..459bd6661fc5db0df74908fffcd06bbe7e8892f3 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
@@ -12,36 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <porous_medium>
- <porous_medium id="0">
- <permeability>
- <permeability_tensor_entries>mu0</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>n0</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- <porous_medium id="1">
- <permeability>
- <permeability_tensor_entries>mu1</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>n1</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0.0</value>
- </storage>
- </porous_medium>
- </porous_medium>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_p</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
index 208d76a598ac012e81bafeb9e792ca687a4d3a7d..19689dde4438b663ce0c0b32f2b628c25829f4e5 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
@@ -12,22 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
index 66824437c0f7050c97b40991cc03bdd585441030..7ed01e67488b18258d26496be6391ea3cfa41ecf 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
@@ -12,22 +12,6 @@
<temperature>T</temperature>
<pressure>p</pressure>
</process_variables>
- <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>
<density_solid>rho_solid</density_solid>
<specific_heat_capacity_solid>c_solid</specific_heat_capacity_solid>
<thermal_conductivity_solid>lambda_solid</thermal_conductivity_solid>