Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r27f3db92495948d4c1192421c1b0c20338c4a034 -r7665e7b142961a50c5e77c44877247366a374526
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 7665e7b142961a50c5e77c44877247366a374526)
@@ -1268,14 +1268,16 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execBloodFlowTest( 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();
+
     // Retrieve blood flow sensor calibration data and check for sensor connected status
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() ) )
     {
-        bloodFlowCalGain = cal.bloodFlowGain;
-        bloodFlowCalOffset = cal.bloodFlowOffset_mL_min;
+        bloodFlowCalGain = cal.hdFlowSensors.gain;
+        bloodFlowCalOffset = cal.hdFlowSensors.offset;
         result = SELF_TEST_STATUS_PASSED;
     }
 
@@ -1286,58 +1288,7 @@
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
-
-
-/*********************************************************************//**
- * @brief
- * The setBloodFlowCalibration function sets the blood flow calibration
- * factors and has them stored in non-volatile memory.
- * @details Inputs: none
- * @details Outputs: bloodFlowCalGain, bloodFlowCalOffset
- * @param gain gain calibration factor for blood flow sensor
- * @param offset offset calibration factor for blood flow sensor
- * @return TRUE if calibration factors successfully set/stored, FALSE if not
- *************************************************************************/
-BOOL setBloodFlowCalibration( F32 gain, F32 offset )
-{
-    BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
-    {
-        CALIBRATION_DATA_T cal;
-
-        getCalibrationData( &cal );
-        // Keep locally and apply immediately
-        bloodFlowCalGain = gain;
-        bloodFlowCalOffset = offset;
-        // Also update calibration record in non-volatile memory
-        cal.bloodFlowGain = gain;
-        cal.bloodFlowOffset_mL_min = offset;
-        if ( TRUE == setCalibrationData( cal ) )
-        {
-            result = TRUE;
-        }
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The getBloodFlowCalibration function retrieves the current blood flow
- * calibration factors.
- * @details Inputs: bloodFlowCalGain, bloodFlowCalOffset
- * @details Outputs: none
- * @param gain value to populate with gain calibration factor for blood flow sensor
- * @param offset value to populate with offset calibration factor for blood flow sensor
- * @return none
- *************************************************************************/
-void getBloodFlowCalibration( F32 *gain, F32 *offset )
-{
-    *gain = bloodFlowCalGain;
-    *offset = bloodFlowCalOffset;
-}
-
 /*********************************************************************//**
  * @brief
  * The testSetBloodFlowDataPublishIntervalOverride function overrides the