Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r3d413ac026e89a1324c4b0e99516735ec382fed8 -rfe0dfb19ecdd938e740b15fe40722d61817eb828
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 3d413ac026e89a1324c4b0e99516735ec382fed8)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision fe0dfb19ecdd938e740b15fe40722d61817eb828)
@@ -55,6 +55,7 @@
 #define CONCENTRATE_PUMP_VOLUME_PER_PULSE                   ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV )
 
 #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 500 / TASK_GENERAL_INTERVAL )                     ///< Interval (ms/task time) at which the concentrate pump is monitored.
+
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 1 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )       ///< Interval (ms/task time) at which the concentrate pump is controlled.
 #define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD   ( 5 * MS_PER_SECOND )                               ///< Persistence period for concentrate pump speed control error.
 
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r3d413ac026e89a1324c4b0e99516735ec382fed8 -rfe0dfb19ecdd938e740b15fe40722d61817eb828
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3d413ac026e89a1324c4b0e99516735ec382fed8)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision fe0dfb19ecdd938e740b15fe40722d61817eb828)
@@ -183,6 +183,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -193,6 +194,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -226,13 +228,16 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         if ( TRUE == heatersStatus[ heater ].hasTargetTempChanged )
         {
             status                                    = TRUE;
             heatersStatus[ heater ].startHeaterSignal = TRUE;
         }
+#endif
     }
     else
     {
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r3d413ac026e89a1324c4b0e99516735ec382fed8 -rfe0dfb19ecdd938e740b15fe40722d61817eb828
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 3d413ac026e89a1324c4b0e99516735ec382fed8)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision fe0dfb19ecdd938e740b15fe40722d61817eb828)
@@ -988,4 +988,32 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testTareReservoir function tares a given reservoir.  It is assumed
+ * that the given reservoir has already been drained.
+ * @details Inputs: drainVolumeTargetMl
+ * @details Outputs: drainVolumeTargetMl
+ * @param value ID of reservoir to tare
+ * @return TRUE if tare successful, FALSE if not
+ *************************************************************************/
+BOOL testTareReservoir( U32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        if ( value < NUM_OF_DG_RESERVOIRS )
+        {
+            result = TRUE;
+            tareLoadCellRequest = TRUE;
+            testSetReservoirDrainVolumeMlOverride( 0 );
+            tareLoadCellsAtEmpty( (DG_RESERVOIR_ID_T)value );
+            testResetReservoirDrainVolumeMlOverride();
+        }
+    }
+
+    return result;
+}
+
 /**@}*/