diff --git a/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj b/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj
index c983e792679d7220b3b8274f7648e5b5d1824b2d..67cab616d6c3a6027c719ca260d57f22dc08cbfe 100644
--- a/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj
+++ b/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>K</thermal_conductivity>
-            <heat_capacity>Cp</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -18,6 +15,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>3.2</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2500</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1000</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -64,21 +88,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>3.2</value>
-        </parameter>
-        <parameter>
-            <name>Cp</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2500</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj
index cc66e2b45dcd08068690a0521e1cfa6204fd3767..e0883984a7360d04abd294eb0bb66928b857d2b8 100644
--- a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj
+++ b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj
@@ -11,9 +11,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>K</thermal_conductivity>
-            <heat_capacity>Cp</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -63,22 +60,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>5</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1000</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2500</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>5</value>
-        </parameter>
-        <parameter>
-            <name>Cp</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2500</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj b/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj
index ce056b23d91332c178f7a5d390c21dc01e70b8b2..ad0a1f0f012d61f30e31c2d30ccc1f02c20f93d2 100644
--- a/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj
+++ b/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj
@@ -11,9 +11,6 @@
             <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>
@@ -63,22 +60,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj b/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj
index c86c24e0b21842e6858fb0c9119fdbb26affdd03..49abebe13def1c344ca063276377506c77e28e6c 100644
--- a/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj
+++ b/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj
@@ -11,9 +11,6 @@
             <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>
@@ -63,22 +60,34 @@
             </variables>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>.0001</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>.0001</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/1D_neumann/newton.prj b/Tests/Data/Parabolic/T/1D_neumann/newton.prj
index 70c0fae98afc9f3631a0ec2e292c5e844bbbda8d..f819b77694293c928990bccb388e2cc7ed5bdf6e 100644
--- a/Tests/Data/Parabolic/T/1D_neumann/newton.prj
+++ b/Tests/Data/Parabolic/T/1D_neumann/newton.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>K</thermal_conductivity>
-            <heat_capacity>Cp</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -18,6 +15,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2500</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>3.2</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1000</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -72,21 +96,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>3.2</value>
-        </parameter>
-        <parameter>
-            <name>Cp</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2500</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj b/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj
index 083f8a4c91ae5dc57e14bb5451e73e6488de7477..589bdd9dc6e96e650d525330c5775593122f5b87 100644
--- a/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj
+++ b/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>K</thermal_conductivity>
-            <heat_capacity>Cp</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -19,6 +16,33 @@
             <mass_lumping>true</mass_lumping>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>3.2</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1000</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2500</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -73,21 +97,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>3.2</value>
-        </parameter>
-        <parameter>
-            <name>Cp</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2500</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj b/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj
index 8c6a40df946cfcb76876b4fa4907e879df3d7c6b..da07d658b3f9ca961d6bbd2dc09ac9fea52bb9d1 100644
--- a/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj
+++ b/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>K</thermal_conductivity>
-            <heat_capacity>Cp</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -18,6 +15,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2500</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1000</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>3.2</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -72,21 +96,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>3.2</value>
-        </parameter>
-        <parameter>
-            <name>Cp</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2500</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/1D_neumann/picard.prj b/Tests/Data/Parabolic/T/1D_neumann/picard.prj
index 90573ce6534bedb976a78706d4f376390331947c..17b0eff7da669448a6e10523b70475f3ef5eb89d 100644
--- a/Tests/Data/Parabolic/T/1D_neumann/picard.prj
+++ b/Tests/Data/Parabolic/T/1D_neumann/picard.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>K</thermal_conductivity>
-            <heat_capacity>Cp</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -18,6 +15,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>3.2</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2500</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1000</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -72,21 +96,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>3.2</value>
-        </parameter>
-        <parameter>
-            <name>Cp</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2500</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj b/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj
index 1b6275d6ddfeeeb95cdc24630de955bf79666b39..c00a6c20ec7c508936674bc8582478707113607d 100644
--- a/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj
+++ b/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>K</thermal_conductivity>
-            <heat_capacity>Cp</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -19,6 +16,33 @@
             <mass_lumping>true</mass_lumping>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>3.2</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1000</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2500</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -73,21 +97,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>K</name>
-            <type>Constant</type>
-            <value>3.2</value>
-        </parameter>
-        <parameter>
-            <name>Cp</name>
-            <type>Constant</type>
-            <value>1000</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2500</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj b/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj
index 733b81a8fa0e483b1ea2e305cc2564098a94d050..73b7490b42b2628bc01cc38e7546ee3413512e88 100644
--- a/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj
+++ b/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj
@@ -7,9 +7,6 @@
             <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>
@@ -18,6 +15,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1500</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>1950.0</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>2.0</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -60,21 +84,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>2.0</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1500</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1950.0</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj b/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj
index ced9c676fc5d76ce4198faffdcc6aa86de824635..d075cf0af4da0a88655cf0c31dced07e10378959 100644
--- a/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj
+++ b/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj
@@ -7,9 +7,6 @@
             <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>
@@ -18,6 +15,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2.0</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -60,21 +84,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2.0</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj b/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj
index 75412a419a7efedf21a3438359ada33f6ebfaeb1..2db8205a60ad31225551d61f44a36e00fea7042c 100644
--- a/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj
+++ b/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj
@@ -7,9 +7,6 @@
             <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>
@@ -18,6 +15,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>2.0</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
@@ -60,21 +84,6 @@
         </output>
     </time_loop>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>2.0</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj
index c257a57c629995bebe0575ae45da9311f8e56552..015d834099399cc29d8f38fc4ce831afeffee003 100644
--- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj
+++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj
@@ -10,9 +10,6 @@
             <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>
@@ -62,22 +59,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj
index c0c2f3bcf3ee9de002d3c684ae8a38fa4b0cef6c..c4015ce707c9f97c6a2a28c4e6b37d267bfc8633 100644
--- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj
+++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj
@@ -11,9 +11,6 @@
             <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>
@@ -63,22 +60,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj
index fbda6088b7320609c8df9a91a67af13dc20f3343..ad6608de34a2eaecd379337926323b8ff9b6ecf7 100644
--- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj
+++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj
@@ -10,9 +10,6 @@
             <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>
@@ -62,22 +59,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj
index 0d069735f8f05ab0819ecc7ae4abaec9f3ab30e7..54d528701c48c53e701076adea997883e235aa13 100644
--- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj
+++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj
@@ -10,9 +10,6 @@
             <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>
@@ -62,22 +59,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj
index 221b4f626b26622d422e9f49297758971b25d0cc..8e0c40c035c7df15c2f3f9626a06fa14bb38f204 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj
@@ -10,9 +10,6 @@
             <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>
@@ -62,22 +59,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj
index 85111e97763ee80736276298b125d050a25f0560..303efe69ae663b1094b5c1cc075b495b3fb5ddee 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj
@@ -10,9 +10,6 @@
             <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>
@@ -62,22 +59,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj
index 7886babaaa6e547d8dbbc969c61dbd8a3b6b7c50..ffdcbfbb148445932795a3a06d152c28301ce030 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj
@@ -10,9 +10,6 @@
             <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>
@@ -62,22 +59,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>0</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj
index ee9e4dea6bc4989532caade07fc5d7f3baa7ec19..be42f4aa4a17aff0c2321ef0d4d9b48ef21b7585 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj
@@ -10,9 +10,6 @@
             <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>
@@ -62,22 +59,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj
index a1acceb0b19bbe99a7bc7f89289ba40ae763445c..ffb5e5960049519348869b5baff3e49fa582eb08 100644
--- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj
+++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj
@@ -10,9 +10,6 @@
             <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>
@@ -62,22 +59,34 @@
             <suffix>_ts_{:timestep}_t_{:time}</suffix>
         </output>
     </time_loop>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Constant</type>
+                    <value>1</value>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <parameters>
-        <parameter>
-            <name>lambda</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>c_p</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
-        <parameter>
-            <name>rho</name>
-            <type>Constant</type>
-            <value>1</value>
-        </parameter>
         <parameter>
             <name>T0</name>
             <type>Constant</type>
diff --git a/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj b/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj
old mode 100755
new mode 100644
index 884c75cf335c62d437b6948e47cb56371c609f97..84cf61892aa5e20db57016706d6a0f0337a985eb
--- a/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj
+++ b/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>lambda</thermal_conductivity>
-            <heat_capacity>c</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -17,6 +14,58 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Parameter</type>
+                    <parameter_name>rho</parameter_name>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Parameter</type>
+                    <parameter_name>c</parameter_name>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Parameter</type>
+                    <parameter_name>lambda</parameter_name>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+        <medium id="1">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Parameter</type>
+                    <parameter_name>rho</parameter_name>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Parameter</type>
+                    <parameter_name>c</parameter_name>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Parameter</type>
+                    <parameter_name>lambda</parameter_name>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
diff --git a/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj b/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj
old mode 100755
new mode 100644
index 212946c0eb760cbb4ee57268b2515e37f1401684..e1eb91238616e3d7a47c3cdf6a9e6b7c378182cd
--- a/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj
+++ b/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>lambda</thermal_conductivity>
-            <heat_capacity>c</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -17,6 +14,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Parameter</type>
+                    <parameter_name>lambda</parameter_name>
+                </property>
+                <property>
+                    <name>density</name>
+                    <type>Parameter</type>
+                    <parameter_name>rho</parameter_name>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Parameter</type>
+                    <parameter_name>c</parameter_name>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
diff --git a/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj b/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj
old mode 100755
new mode 100644
index 598e0c44c1443ef414d7a7a3cbaa5a34148c0ffe..6183e854e6528d62303e12b8516ea9ec20c81561
--- a/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj
+++ b/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>lambda</thermal_conductivity>
-            <heat_capacity>c</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -18,6 +15,33 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Parameter</type>
+                    <parameter_name>rho</parameter_name>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Parameter</type>
+                    <parameter_name>c</parameter_name>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Parameter</type>
+                    <parameter_name>lambda</parameter_name>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">
diff --git a/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj b/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj
old mode 100755
new mode 100644
index 401a73d2e098f221028354fb4acae8bc557536c1..3a3617bda01725f06646ee2b87c48eb50856e462
--- a/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj
+++ b/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj
@@ -7,9 +7,6 @@
             <name>HeatConduction</name>
             <type>HEAT_CONDUCTION</type>
             <integration_order>2</integration_order>
-            <thermal_conductivity>lambda</thermal_conductivity>
-            <heat_capacity>c</heat_capacity>
-            <density>rho</density>
             <process_variables>
                 <process_variable>temperature</process_variable>
             </process_variables>
@@ -18,6 +15,58 @@
             </secondary_variables>
         </process>
     </processes>
+    <media>
+        <medium id="0">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Parameter</type>
+                    <parameter_name>rho</parameter_name>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Parameter</type>
+                    <parameter_name>lambda</parameter_name>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Parameter</type>
+                    <parameter_name>c</parameter_name>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+        <medium id="1">
+            <phases/>
+            <properties>
+                <property>
+                    <name>density</name>
+                    <type>Parameter</type>
+                    <parameter_name>rho</parameter_name>
+                </property>
+                <property>
+                    <name>thermal_conductivity</name>
+                    <type>Parameter</type>
+                    <parameter_name>lambda</parameter_name>
+                </property>
+                <property>
+                    <name>heat_capacity</name>
+                    <type>Parameter</type>
+                    <parameter_name>c</parameter_name>
+                </property>
+                <property>
+                    <name>reference_temperature</name>
+                    <type>Constant</type>
+                    <value>293.15</value>
+                </property>
+            </properties>
+        </medium>
+    </media>
     <time_loop>
         <processes>
             <process ref="HeatConduction">