Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -rac2c218b9e310a14d2872c9b4c32a6f69615088e -rffaaf7d1e1eb5715eac3f7c7b424a4648526344d
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision ac2c218b9e310a14d2872c9b4c32a6f69615088e)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision ffaaf7d1e1eb5715eac3f7c7b424a4648526344d)
@@ -1258,20 +1258,19 @@
  *************************************************************************/
 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();
+
     switch ( bloodPumpSelfTestState )
     {
         case BLOOD_FLOW_SELF_TEST_STATE_START:
-            // Retrieve blood flow sensor calibration data
-            if ( TRUE == getCalibrationData( &cal ) )
-            {
-                bloodFlowCalGain = cal.bloodFlowGain;
-                bloodFlowCalOffset = cal.bloodFlowOffset_mL_min;
-                bloodPumpSelfTestState = BLOOD_FLOW_TEST_STATE_COMPLETE;  // TODO - implement rest of self-test(s)
-                result = SELF_TEST_STATUS_PASSED;
-            }
+
+            bloodFlowCalGain = cal.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].gain;
+            bloodFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_BLOOD_FLOW_SENSOR ].offset;
+            bloodPumpSelfTestState = BLOOD_FLOW_TEST_STATE_COMPLETE;  // TODO - implement rest of self-test(s)
+            result = SELF_TEST_STATUS_PASSED;
             break;
 
         case BLOOD_FLOW_TEST_STATE_IN_PROGRESS:
@@ -1292,58 +1291,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