Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r85a680de4306aa033b1dc1f386fa5fa0a25cf73b -rd6c75118f4e5792b40b744a0b29e44c78368a469
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 85a680de4306aa033b1dc1f386fa5fa0a25cf73b)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
@@ -1226,15 +1226,17 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execDialInFlowTest( void )
 {
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
-    CALIBRATION_DATA_T cal;
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_FAILED;
+
+    // Get the flow sensors calibration record
+    HD_FLOW_SENSORS_CAL_RECORD_T cal = getHDFlowSensorsCalibrationRecord();
 
 #ifndef SKIP_CALIBRATION_TESTS
     // Retrieve dialysate flow sensor calibration data
-    if ( ( TRUE == getCalibrationData( &cal ) ) && ( DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() ) )
+    if (  DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() )
     {
-        dialInFlowCalGain = cal.dialysateFlowGain;
-        dialInFlowCalOffset = cal.dialysateFlowOffset_mL_min;
+        dialInFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].gain;
+        dialInFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].offset;
         result = SELF_TEST_STATUS_PASSED;
     }
 #else
@@ -1249,57 +1251,6 @@
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
-
-/*********************************************************************//**
- * @brief
- * The setDialInFlowCalibration function sets the dialysate flow calibration
- * factors and has them stored in non-volatile memory.
- * @details Inputs: none
- * @details Outputs: dialInFlowCalGain, dialInFlowCalOffset
- * @param gain gain calibration factor for dialysate flow sensor
- * @param offset offset calibration factor for dialysate flow sensor
- * @return TRUE if calibration factors successfully set/stored, FALSE if not
- *************************************************************************/
-BOOL setDialInFlowCalibration( F32 gain, F32 offset )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        CALIBRATION_DATA_T cal;
-
-        getCalibrationData( &cal );
-        // Keep locally and apply immediately
-        dialInFlowCalGain = gain;
-        dialInFlowCalOffset = offset;
-        // Also update calibration record in non-volatile memory
-        cal.dialysateFlowGain = gain;
-        cal.dialysateFlowOffset_mL_min = offset;
-        if ( TRUE == setCalibrationData( cal ) )
-        {
-            result = TRUE;
-        }
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The getDialInFlowCalibration function retrieves the current dialysate flow
- * calibration factors.
- * @details Inputs: dialInFlowCalGain, dialInFlowCalOffset
- * @details Outputs: none
- * @param gain value to populate with gain calibration factor for dialysate flow sensor
- * @param offset value to populate with offset calibration factor for dialysate flow sensor
- * @return none
- *************************************************************************/
-void getDialInFlowCalibration( F32 *gain, F32 *offset )
-{
-    *gain = dialInFlowCalGain;
-    *offset = dialInFlowCalOffset;
-}
-
 /*********************************************************************//**
  * @brief
  * The testSetDialInFlowDataPublishIntervalOverride function overrides the