Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r61fc45d7a43557312d6abd00a6b01e6823b44f04 -r2b6abbe347b2da260a4d46aca233bbfb6a59bf04
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 61fc45d7a43557312d6abd00a6b01e6823b44f04)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2b6abbe347b2da260a4d46aca233bbfb6a59bf04)
@@ -115,7 +115,6 @@
 static U32 flushBubblesStartTime;                                                                            ///< Starting time for flush bubbles.
 static U32 concentratePumpPrimeCount;                                                                        ///< Interval count for concentrate pump prime.
 
-static F32 integratedVolumeML;                                                                               ///< Total RO flow rate over period of time.
 static BOOL didFMPCheckStart;                                                                                ///< Flag indicates whether FMP flow vs. LC volume check has begun.
 static F32 acidConductivityTotal;                                                                            ///< Total of acid conductivity during fill.
 static F32 bicarbConductivityTotal;                                                                          ///< Total of bicarb conductivity during fill.
@@ -137,6 +136,7 @@
 static OVERRIDE_F32_T usedBicarbVolumeML = { 0.0, 0.0, 0.0, 0.0 };                                           ///< The integrated bicarb concentration volume has been used in mL.
 static OVERRIDE_U32_T fillModeDataPublishInterval = { FILL_MODE_DATA_PUB_INTERVAL,
                                                       FILL_MODE_DATA_PUB_INTERVAL, 0, 0 };                   ///< Interval (in ms) at which to publish fill mode data to CAN bus.
+static OVERRIDE_F32_T integratedVolumeML = { 0.0, 0.0, 0.0, 0.0 };                                           ///< Total RO flow rate over period of time.
 
 // ********** private function prototypes **********
 
@@ -172,7 +172,7 @@
     dialysateFillStartTime        = 0;
     dataPublishCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
     reservoirBaseWeight           = 0.0F;
-    integratedVolumeML            = 0.0F;
+    integratedVolumeML.data       = 0.0F;
     didFMPCheckStart              = FALSE;
     concentrateTestStartTime      = 0;
     acidConductivityTotal         = 0.0F;
@@ -326,6 +326,20 @@
 
 /*********************************************************************//**
  * @brief
+ * The getIntegratedVolumeML function returns the integrated volume in mL
+ * @details Inputs: none
+ * @details Outputs: integrated volume
+ * @return integrated volume
+ *************************************************************************/
+F32 getIntegratedVolumeML( void )
+{
+
+    F32 integratedVolume = getF32OverrideValue(&integratedVolumeML);
+    return integratedVolume;
+}
+
+/*********************************************************************//**
+ * @brief
  * The resetFillStatusParameters function resets the fill status parameters.
  * @details Inputs: none
  * @details Outputs: fillStatus
@@ -386,6 +400,8 @@
     return volume;
 }
 
+
+
 /*********************************************************************//**
  * @brief
  * The resetChemicalUsedVolumeML function resets the used volume of a chemical
@@ -757,7 +773,7 @@
             reservoirBaseWeight = getReservoirWeight( getInactiveReservoir() );
         }
 
-        integratedVolumeML += getMeasuredROFlowRateWithConcPumpsLPM() * ML_PER_LITER * FLOW_INTEGRATOR;
+        integratedVolumeML.data += getMeasuredROFlowRateWithConcPumpsLPM() * ML_PER_LITER * FLOW_INTEGRATOR;
     }
 
     usedAcidVolumeML.data   += getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) * FLOW_INTEGRATOR;
@@ -781,8 +797,8 @@
     // If we've reached our target fill to volume (by weight), we're done filling - go back to generation idle mode  // SRSDG 398
     if ( TRUE == hasTargetFillVolumeBeenReached( inactiveReservoir ) )
     {
-        F32 filledVolumeML                           = getReservoirWeight( inactiveReservoir ) - reservoirBaseWeight;
-        F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / integratedVolumeML ) );
+        F32 filledVolumeML                           = getReservoirWeight( inactiveRsrvr ) - reservoirBaseWeight;
+        F32 integratedVolumeToLoadCellReadingPercent = fabs( 1.0F - ( filledVolumeML / getIntegratedVolumeML() ) );
         F32 avgAcidConductivity                      = acidConductivityTotal / conductivitySampleCount;
         F32 avgBicarbConductivity                    = bicarbConductivityTotal / conductivitySampleCount;
         F32 acidNormalConductivity                   = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConductivityUSPerCM;
@@ -794,7 +810,7 @@
         {
             if ( integratedVolumeToLoadCellReadingPercent > FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE )  // SRSDG 240
             {
-                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, filledVolumeML, integratedVolumeML );
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_FLOW_METER_CHECK_FAILURE, filledVolumeML, getIntegratedVolumeML() );
             }
         }
 
@@ -1015,7 +1031,7 @@
         fillModeData.pctDiffInConductivity     = pctDiffInConductivity;
         fillModeData.usedAcidVolumeML          = getChemicalUsedVolumeML( ACID );
         fillModeData.usedBicarbVolumeML        = getChemicalUsedVolumeML( BICARB );
-        fillModeData.integratedVolumeML        = integratedVolumeML;
+        fillModeData.integratedVolumeML        = getIntegratedVolumeML();
 
         broadcastData( MSG_ID_DG_FILL_MODE_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&fillModeData, sizeof( DG_FILL_MODE_DATA_T ) );
 
@@ -1171,4 +1187,49 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetFillModeDataPublishIntervalOverride function overrides the
+ * fill mode data publish interval.
+ * @details Inputs: FillModeDataPublishInterval
+ * @details Outputs: FillModeDataPublishInterval
+ * @param: value override fill mode data publish interval with (in ms)
+ * @return TRUE if override successful, FALSE if not
+ *************************************************************************/
+BOOL testSetIntegratedVolumeOverride( U32 value )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        integratedVolumeML.ovData   = value;
+        integratedVolumeML.override = OVERRIDE_KEY;
+        result = TRUE;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetFillModeDataPublishIntervalOverride function resets the
+ * override of the fill mode data publish interval.
+ * @details Inputs: FillModeDataPublishInterval
+ * @details Outputs: FillModeDataPublishInterval
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetIntegratedVolumeOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        integratedVolumeML.override = OVERRIDE_RESET;
+        integratedVolumeML.ovData   = integratedVolumeML.ovInitData;
+        result = TRUE;
+    }
+
+    return result;
+}
+
 /**@}*/