diff --git a/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj b/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
index 4745fa4653a61020287648ebed53e99551cada72..ca127eba21629fe4f85e599705515bfbbe1aa61f 100644
--- a/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/MassConservation/mass_conservation.prj
@@ -53,13 +53,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1e3</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.0</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
index 9cae2ee138bc5188dddff371bdcde818a28acaa9..f37ddb167c2a00e9092ca35e9ebbb93d6ee9b291 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj
@@ -49,7 +49,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -60,7 +59,6 @@
<reference_condition>0</reference_condition>
<slope>5e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
index a6a0a9eb681d57964df2d279998a2f3a71a5dbca..c767a3997373fd338641ce01f656c6946254f0e7 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj
@@ -49,13 +49,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.0</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
index 54f0576602a48f1954b5265587e73a6201fee950..5283d573c820a67ef09bba20e93452101946cd8e 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj
@@ -91,13 +91,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.0</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
index 9adfed90e52b51961ea8893791896328bffd7a45..023cf051c5ca08974d0ebbabe00cf9350b7b7b75 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj
@@ -49,7 +49,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -60,7 +59,6 @@
<reference_condition>0.5</reference_condition>
<slope>5e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
index 8c7239ca5a6323e716afe9dd1f8519e6e231f138..b120bcf44a788fc36e3c6eefcc923c51d6d7a1fd 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj
@@ -49,7 +49,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -60,7 +59,6 @@
<reference_condition>0.5</reference_condition>
<slope>2e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
index f34b01269e4ab83707972fd3840e1ae47f7eaa00..8844f562b9e06acdb65305ee67601b0e0150a1a3 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj
@@ -49,7 +49,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -60,7 +59,6 @@
<reference_condition>0.5</reference_condition>
<slope>2e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
index 2eb4a436e39de9d7ba2945ce465175f5d0e88655..5db426768b733675043b79c047ca5db29eb399dd 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
@@ -49,7 +49,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -60,7 +59,6 @@
<reference_condition>0</reference_condition>
<slope>5e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
index 564c74d0f0b8bfcb6dcb629f2c48a6fb160d73e1..5160d1e64212cbba9a604ef4eb10c90198d2d3f0 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj
@@ -49,7 +49,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -60,7 +59,6 @@
<reference_condition>0</reference_condition>
<slope>5e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
index 4a972da2b84f02cea33faa33fadca5dfc7f2b341..fe31e0824129f81c5c517c7b427b7efc65e2c476 100644
--- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj
@@ -58,13 +58,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.0</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
index 12cf4c8ae2d2d2a7e70904578d8167e63ca0aded..f7dd9328dc5d5b259b73479e50c9f2bdc9e85b31 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionAndStorage.prj
@@ -50,7 +50,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -61,7 +60,6 @@
<reference_condition>0</reference_condition>
<slope>5e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
index 149934eeeedb40fa844d469feeae85d4a4f8bae2..84f75150ef2f6b9c1d570c179b7b88a613e9dc5b 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/ConcentrationDiffusionOnly.prj
@@ -50,13 +50,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.0</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
index 9236f69e0de505f6f608e436cc13ce59cd1560f3..f11d366b254acc9313becce86a3cc5a705f3fd0b 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvection.prj
@@ -50,7 +50,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -61,7 +60,6 @@
<reference_condition>0.5</reference_condition>
<slope>5e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
index 0b9ff4a7428658859b6d26175e56df8ddcd3791c..4832a790c53171c8a1afdc6decc8312a3b6c7689 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDecay.prj
@@ -50,7 +50,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -61,7 +60,6 @@
<reference_condition>0.5</reference_condition>
<slope>2e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
index 1baac43487aa9ffcd6cc716e7c76afe5129531ad..26283062ecddab8139d2fc24c920a6aca74a8f34 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion.prj
@@ -50,7 +50,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -61,7 +60,6 @@
<reference_condition>0.5</reference_condition>
<slope>2e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
index 697bded4c6476e0dcd66e8832975bbb84ca1e60e..b01cbaae345a0440d13e9f29eba026f98026045c 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
@@ -50,7 +50,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -61,7 +60,6 @@
<reference_condition>0</reference_condition>
<slope>5e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
index cc0c258826d0b8bee36edc1332727452ce22f77f..ddc9cd1a06909c8b3e70a2b5b2a4a99b39de217c 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndAdvectionAndDispersion_3Components.prj
@@ -92,7 +92,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -103,7 +102,6 @@
<reference_condition>0.5</reference_condition>
<slope>2e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
index 6271b2f3ddd0e7799e677c79b6ecf518af421bbc..0261d42979e0d8cfc65f6e09ab6ba782f4e2c25d 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/DiffusionAndStorageAndGravityAndDispersionHalf.prj
@@ -50,7 +50,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -61,7 +60,6 @@
<reference_condition>0</reference_condition>
<slope>5e-5</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
index e613f06cf3605c22a85b19e9fbf3d8eded744494..5fc72418f647db4112f326c85b81629dfc0f5da5 100644
--- a/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/StaggeredScheme/surfaceflux_component-transport_cube_1e3.prj
@@ -59,13 +59,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.0</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj b/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
index 67380a662e9302c354561995fa0aaad654dbdb01..4e12d2e40ba48a6421b2b15f73557034262de4da 100644
--- a/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/Theis/theis.prj
@@ -57,7 +57,6 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
@@ -68,7 +67,6 @@
<reference_condition>0</reference_condition>
<slope>5.0968E-08</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
index f25c563652dc406bc4d598b05792a1cc8ca70f78..82b5cfbbd2bd4ce2549c5417bcc68e33849146fa 100644
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj
@@ -52,13 +52,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.2</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
index 536703e4ff9501784ad40225e1e4f35bdbdc0f65..e46ad820107ab7669aa6c084699750296a032fa1 100644
--- a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj
@@ -49,13 +49,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.2</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
index 159e40c0141a4a44bf72d2ce5ba12de96363e6aa..abd3d4e80641df779440edcacd834e7ff44bdd5b 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
@@ -52,13 +52,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>concentration</variable_name>
<reference_condition>0</reference_condition>
<slope>0.701</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
index 256043a6805de4844a3c51aa00cf6cfebcedce2c..147685f6bd9de939ba23f564db1a160e902f690e 100644
--- a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
+++ b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
@@ -37,13 +37,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<slope>-4.3e-4</slope>
<reference_condition>20</reference_condition>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj b/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
index 5ff73f383d7d40d8afab8a666fb6fe98f5f28bb8..f85019a62b93e58ed5aa0f2e7154ac7f7cec8dfa 100644
--- a/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
+++ b/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
@@ -44,13 +44,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1.0e+3</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<slope>-4.3e-4</slope>
<reference_condition>20</reference_condition>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
@@ -132,13 +130,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1.0e+3</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<slope>-4.3e-4</slope>
<reference_condition>20</reference_condition>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
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 f6019f357ae11cbae0de811aa90b6012ba984901..6765dd13440661f56bbbbdb54793588040576bf0 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
@@ -46,13 +46,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>20</reference_condition>
<slope>-4.3e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
index 37934ee2a603aa16c42f4a0881ae3b41cf549909..0d5503fed5f892eec93b4a68cfab008a8197f928 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
@@ -27,13 +27,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>20</reference_condition>
<slope>-4.3e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
index d0ab97ea4621091471aa0e005d88f1ec978fe09a..edfac132801f13fb4a16781545a41d4030157266 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
@@ -28,13 +28,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000.0</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>293.0</reference_condition>
<slope>-4.3e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
@@ -112,13 +110,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000.0</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>293.0</reference_condition>
<slope>-4.3e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
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 c917a415e8298ab7e8467372735ab266f5863083..11e1a7ba9fe2e2747115d108f5b67760a563b7b0 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
@@ -38,13 +38,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<slope>-4.3e-4</slope>
<reference_condition>20</reference_condition>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
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 4bc76f8eac5c3d46b74874b70847eb0623de3e0c..486dce76e493ccce28d51556bac0026dca3a638a 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
@@ -38,13 +38,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1000</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<slope>-4.3e-4</slope>
<reference_condition>20</reference_condition>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>viscosity</name>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
index 836015ac38065dd76ac5aa65901fe4b7f08f8f58..a57349b8cbe4e97574ad0c245750d47bb349b6c6 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
@@ -46,13 +46,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1e-6</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>283.15</reference_condition>
<slope>-2.07e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>thermal_expansivity</name>
@@ -132,13 +130,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1e-6</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>283.15</reference_condition>
<slope>-2.07e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>thermal_expansivity</name>
@@ -218,13 +214,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1e-6</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>283.15</reference_condition>
<slope>-2.07e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>thermal_expansivity</name>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
index 6c05c0a549295d8da49daeffd344a709c2d567b4..16a7e8e03d5acbf20f8dbdc6e4dcbc8166674202 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
@@ -47,13 +47,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1e-6</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>283.15</reference_condition>
<slope>-2.07e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>thermal_expansivity</name>
@@ -133,13 +131,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1e-6</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>283.15</reference_condition>
<slope>-2.07e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>thermal_expansivity</name>
@@ -219,13 +215,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1e-6</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>283.15</reference_condition>
<slope>-2.07e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>thermal_expansivity</name>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
index 0b47df69227e77de6e94926304edf8389d03295b..6a5a6554797362047721c55859bbe31ab7b3d603 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
@@ -47,13 +47,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>999.1</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>273.15</reference_condition>
<slope>-4e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>thermal_expansivity</name>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj b/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
index d8fc949e157a82454e97f19853cd64625b9f772b..204ccefeed85d6b9ff93115a317222982f5f8570 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
@@ -47,13 +47,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1e-6</reference_value>
- <independent_variables>
<independent_variable>
<variable_name>temperature</variable_name>
<reference_condition>273.15</reference_condition>
<slope>-2.07e-4</slope>
</independent_variable>
- </independent_variables>
</property>
<property>
<name>thermal_expansivity</name>