diff --git a/Tests/Data/Parabolic/T/3D_2U_BHE/3D_2U_BHE.prj b/Tests/Data/Parabolic/T/3D_2U_BHE/3D_2U_BHE.prj
index a2012b5d79be5fc5970b80de65b6eddc5ac3bdab..65448afc9d0d0cc5703bbdc50b00dd5f102c4edd 100644
--- a/Tests/Data/Parabolic/T/3D_2U_BHE/3D_2U_BHE.prj
+++ b/Tests/Data/Parabolic/T/3D_2U_BHE/3D_2U_BHE.prj
@@ -60,15 +60,15 @@
                 <phase>
                     <type>AqueousLiquid</type>
                     <properties>
-                        <property>
-                            <name>specific_heat_capacity</name>
+						<property>
+                            <name>phase_velocity</name>
                             <type>Constant</type>
-                            <value>4068</value>
+                            <value>0 0 0</value>
                         </property>
                         <property>
-                            <name>thermal_conductivity</name>
+                            <name>specific_heat_capacity</name>
                             <type>Constant</type>
-                            <value>0.1</value>
+                            <value>4068</value>
                         </property>
                         <property>
                             <name>density</name>
@@ -85,11 +85,6 @@
                             <type>Constant</type>
                             <value>1778</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>2.78018</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -105,11 +100,6 @@
                             <type>Constant</type>
                             <value>1000</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>3.2</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -119,6 +109,16 @@
                 </phase>
             </phases>
             <properties>
+				<property>
+                    <name>porosity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+				<property>
+                     <name>thermal_conductivity</name>
+                     <type>Constant</type>
+                     <value>2.78018</value>
+                </property>
                 <property>
                     <name>thermal_longitudinal_dispersivity</name>
                     <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_Beier_sandbox/beier_sandbox.prj b/Tests/Data/Parabolic/T/3D_Beier_sandbox/beier_sandbox.prj
index 133091f032e297febb9eb0fd21a5ff636b486246..b71fb77e37f158920e7a5a41dcf17c4e4516ac36 100644
--- a/Tests/Data/Parabolic/T/3D_Beier_sandbox/beier_sandbox.prj
+++ b/Tests/Data/Parabolic/T/3D_Beier_sandbox/beier_sandbox.prj
@@ -60,15 +60,15 @@
                 <phase>
                     <type>AqueousLiquid</type>
                     <properties>
-                        <property>
-                            <name>specific_heat_capacity</name>
+						<property>
+                            <name>phase_velocity</name>
                             <type>Constant</type>
-                            <value>4068</value>
+                            <value>0 0 0</value>
                         </property>
                         <property>
-                            <name>thermal_conductivity</name>
+                            <name>specific_heat_capacity</name>
                             <type>Constant</type>
-                            <value>0.1</value>
+                            <value>4068</value>
                         </property>
                         <property>
                             <name>density</name>
@@ -85,11 +85,6 @@
                             <type>Constant</type>
                             <value>1778</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>2.78018</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -105,11 +100,6 @@
                             <type>Constant</type>
                             <value>1000</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>3.2</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -119,6 +109,16 @@
                 </phase>
             </phases>
             <properties>
+				<property>
+                    <name>porosity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+				<property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>2.78018</value>
+                </property>
                 <property>
                     <name>thermal_longitudinal_dispersivity</name>
                     <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_Beier_sandbox/fixed_power_constant_flow.prj b/Tests/Data/Parabolic/T/3D_Beier_sandbox/fixed_power_constant_flow.prj
index 2d6ea158e79bb6a55f15a0d28b4f6f7c503b14dc..43593526812afb01f73d42139bd2cfaf53d77c05 100644
--- a/Tests/Data/Parabolic/T/3D_Beier_sandbox/fixed_power_constant_flow.prj
+++ b/Tests/Data/Parabolic/T/3D_Beier_sandbox/fixed_power_constant_flow.prj
@@ -60,15 +60,15 @@
                 <phase>
                     <type>AqueousLiquid</type>
                     <properties>
-                        <property>
-                            <name>specific_heat_capacity</name>
+						<property>
+                            <name>phase_velocity</name>
                             <type>Constant</type>
-                            <value>4068</value>
+                            <value>0 0 0</value>
                         </property>
                         <property>
-                            <name>thermal_conductivity</name>
+                            <name>specific_heat_capacity</name>
                             <type>Constant</type>
-                            <value>0.1</value>
+                            <value>4068</value>
                         </property>
                         <property>
                             <name>density</name>
@@ -85,11 +85,6 @@
                             <type>Constant</type>
                             <value>1778</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>2.78018</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -105,11 +100,6 @@
                             <type>Constant</type>
                             <value>1000</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>3.2</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -119,6 +109,16 @@
                 </phase>
             </phases>
             <properties>
+				<property>
+                    <name>porosity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+				<property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>2.78018</value>
+                </property>
                 <property>
                     <name>thermal_longitudinal_dispersivity</name>
                     <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXA.prj b/Tests/Data/Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXA.prj
index cd1cfdd19f1472221ffcc9bc61127fe83cb25d85..a0980efdacd60164be38563ca908893ece7e339b 100644
--- a/Tests/Data/Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXA.prj
+++ b/Tests/Data/Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXA.prj
@@ -59,15 +59,15 @@
                 <phase>
                     <type>AqueousLiquid</type>
                     <properties>
-                        <property>
-                            <name>specific_heat_capacity</name>
+						<property>
+                            <name>phase_velocity</name>
                             <type>Constant</type>
-                            <value>4068</value>
+                            <value>0 0 0</value>
                         </property>
                         <property>
-                            <name>thermal_conductivity</name>
+                            <name>specific_heat_capacity</name>
                             <type>Constant</type>
-                            <value>0.1</value>
+                            <value>4068</value>
                         </property>
                         <property>
                             <name>density</name>
@@ -84,11 +84,6 @@
                             <type>Constant</type>
                             <value>2000</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>2.5</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -104,11 +99,6 @@
                             <type>Constant</type>
                             <value>1000</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>3.2</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -118,6 +108,16 @@
                 </phase>
             </phases>
             <properties>
+				<property>
+                    <name>porosity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+				<property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>2.5</value>
+                </property>
                 <property>
                     <name>thermal_longitudinal_dispersivity</name>
                     <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXC.prj b/Tests/Data/Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXC.prj
index 99f26fb781ef472daf48aa97b91e41db7212cead..3a6901b85b770bbd3379a542b48b38a7ccc0b793 100644
--- a/Tests/Data/Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXC.prj
+++ b/Tests/Data/Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXC.prj
@@ -59,15 +59,15 @@
                 <phase>
                     <type>AqueousLiquid</type>
                     <properties>
-                        <property>
-                            <name>specific_heat_capacity</name>
+						<property>
+                            <name>phase_velocity</name>
                             <type>Constant</type>
-                            <value>4068</value>
+                            <value>0 0 0</value>
                         </property>
                         <property>
-                            <name>thermal_conductivity</name>
+                            <name>specific_heat_capacity</name>
                             <type>Constant</type>
-                            <value>0.1</value>
+                            <value>4068</value>
                         </property>
                         <property>
                             <name>density</name>
@@ -84,11 +84,6 @@
                             <type>Constant</type>
                             <value>2000</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>2.5</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -104,11 +99,6 @@
                             <type>Constant</type>
                             <value>1000</value>
                         </property>
-                        <property>
-                            <name>thermal_conductivity</name>
-                            <type>Constant</type>
-                            <value>3.2</value>
-                        </property>
                         <property>
                             <name>density</name>
                             <type>Constant</type>
@@ -118,6 +108,16 @@
                 </phase>
             </phases>
             <properties>
+				<property>
+                    <name>porosity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+				<property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>2.5</value>
+                </property>
                 <property>
                     <name>thermal_longitudinal_dispersivity</name>
                     <type>Constant</type>