Index: firmware/App/Modes/StateTxBloodPrime.c
===================================================================
diff -u -raeaaac9b79d9c2aa31ad18be9fb20fe52c936189 -r72ff9f51d34657f46f66936b327a2a390c5f0bd3
--- firmware/App/Modes/StateTxBloodPrime.c	(.../StateTxBloodPrime.c)	(revision aeaaac9b79d9c2aa31ad18be9fb20fe52c936189)
+++ firmware/App/Modes/StateTxBloodPrime.c	(.../StateTxBloodPrime.c)	(revision 72ff9f51d34657f46f66936b327a2a390c5f0bd3)
@@ -293,100 +293,34 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetBloodPrimeVolumeOverride function override the blood prime volume.
- * @details \b Inputs: none
- * @details \b Outputs: cumulativeBloodPrimeVolume_mL
- * @param message Override message from Dialin which includes the blood
- * prime volume to override it to.
- * @return TRUE if override request is successful, FALSE if not
- *************************************************************************/
-BOOL testSetBloodPrimeVolumeOverride( MESSAGE_T *message )
-{
-
-    BOOL result = FALSE;
-    F32  volume_mL = 0.0F;
-
-    if ( ( TRUE == isTestingActivated() ) && ( sizeof( F32 ) == message->hdr.payloadLen ) )
-    {
-        result = TRUE;
-        memcpy( &volume_mL, message->payload, sizeof( F32 ) );
-        cumulativeBloodPrimeVolume_mL.ovData   = volume_mL;
-        cumulativeBloodPrimeVolume_mL.override = OVERRIDE_KEY;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testResetBloodPrimeVolumeOverride function override the blood prime volume.
- * @details \b Inputs: none
- * @details \b Outputs: cumulativeBloodPrimeVolume_mL
- * @param message Override message from Dialin which includes the blood
- * prime volume to override it to.
- * @return TRUE if override request is successful, FALSE if not
- *************************************************************************/
-BOOL testResetBloodPrimeVolumeOverride( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    if ( ( TRUE == isTestingActivated() ) && ( 0U == message->hdr.payloadLen ) )
-    {
-        result = TRUE;
-        cumulativeBloodPrimeVolume_mL.override = OVERRIDE_RESET;
-        cumulativeBloodPrimeVolume_mL.ovData   = cumulativeBloodPrimeVolume_mL.ovInitData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetBloodPrimePublishIntervalOverride function overrides the interval
+ * The testBloodPrimePublishIntervalOverride function overrides the interval
  * at which the TD blood prime data is published.
  * @details \b Inputs: none
  * @details \b Outputs: bloodPrimePublishInterval
  * @param message Override message from Dialin which includes the interval
  * to override the blood prime broadcast interval to.
  * @return TRUE if override request is successful, FALSE if not
  *************************************************************************/
-BOOL testSetBloodPrimePublishIntervalOverride( MESSAGE_T *message )
+BOOL testBloodPrimePublishIntervalOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
-    U32  interval_ms = 0U;
+    BOOL result = u32BroadcastIntervalOverride( message, &bloodPrimePublishInterval, TASK_GENERAL_INTERVAL  );
 
-    if ( ( TRUE == isTestingActivated() ) && ( sizeof( U32 ) == message->hdr.payloadLen ) )
-    {
-        result = TRUE;
-        memcpy( &interval_ms, message->payload, sizeof( U32 ) );
-        bloodPrimePublishInterval.ovData = (U32)( interval_ms / (U32)TASK_GENERAL_INTERVAL );
-        bloodPrimePublishInterval.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetBloodPrimePublishIntervalOverride function overrides the interval
- * at which the TD blood prime data is published.
+ * The testBloodPrimeVolumeOverride function override the blood prime volume.
  * @details \b Inputs: none
- * @details \b Outputs: bloodPrimePublishInterval
- * @param message Override message from Dialin which includes the interval
- * to override the blood prime broadcast interval to.
+ * @details \b Outputs: cumulativeBloodPrimeVolume_mL
+ * @param message Override message from Dialin which includes the blood
+ * prime volume to override it to.
  * @return TRUE if override request is successful, FALSE if not
  *************************************************************************/
-BOOL testResetBloodPrimePublishIntervalOverride( MESSAGE_T *message )
+BOOL testBloodPrimeVolumeOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &cumulativeBloodPrimeVolume_mL );
 
-    if ( ( TRUE == isTestingActivated() ) && ( 0U == message->hdr.payloadLen ) )
-    {
-        result = TRUE;
-        bloodPrimePublishInterval.override = OVERRIDE_RESET;
-        bloodPrimePublishInterval.ovData   = bloodPrimePublishInterval.ovInitData;
-    }
-
     return result;
 }
 
Index: firmware/App/Modes/StateTxBloodPrime.h
===================================================================
diff -u -raeaaac9b79d9c2aa31ad18be9fb20fe52c936189 -r72ff9f51d34657f46f66936b327a2a390c5f0bd3
--- firmware/App/Modes/StateTxBloodPrime.h	(.../StateTxBloodPrime.h)	(revision aeaaac9b79d9c2aa31ad18be9fb20fe52c936189)
+++ firmware/App/Modes/StateTxBloodPrime.h	(.../StateTxBloodPrime.h)	(revision 72ff9f51d34657f46f66936b327a2a390c5f0bd3)
@@ -53,12 +53,9 @@
 
 BLOOD_PRIME_STATE_T getCurrentBloodPrimeState( void );                     // Get the current treatment sub-mode state
 
-BOOL testSetBloodPrimeVolumeOverride( MESSAGE_T *message );
-BOOL testResetBloodPrimeVolumeOverride( MESSAGE_T *message );
+BOOL testBloodPrimePublishIntervalOverride( MESSAGE_T *message );
+BOOL testBloodPrimeVolumeOverride( MESSAGE_T *message );
 
-BOOL testSetBloodPrimePublishIntervalOverride( MESSAGE_T *message );
-BOOL testResetBloodPrimePublishIntervalOverride( MESSAGE_T *message );
-
 /**@}*/
 
 #endif
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -raeaaac9b79d9c2aa31ad18be9fb20fe52c936189 -r72ff9f51d34657f46f66936b327a2a390c5f0bd3
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision aeaaac9b79d9c2aa31ad18be9fb20fe52c936189)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 72ff9f51d34657f46f66936b327a2a390c5f0bd3)
@@ -177,10 +177,8 @@
     { MSG_ID_TD_BARO_PRESSURE_OVERRIDE,                                 &testBaroPressureOverride },
     { MSG_ID_TD_TEMPERATURE_OVERRIDE,                                   &testTemperatureOverride },
     { MSG_ID_TD_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,          &testTemperatureDataPublishIntervalOverride },
-    { MSG_ID_TD_SET_BLOOD_PRIME_VOLUME_OVERRIDE,                        &testSetBloodPrimeVolumeOverride },
-    { MSG_ID_TD_RESET_BLOOD_PRIME_VOLUME_OVERRIDE,                      &testResetBloodPrimeVolumeOverride },
-    { MSG_ID_TD_SET_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,      &testSetBloodPrimePublishIntervalOverride },
-    { MSG_ID_TD_RESET_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,    &testResetBloodPrimePublishIntervalOverride },
+    { MSG_ID_TD_BLOOD_PRIME_VOLUME_OVERRIDE,                            &testBloodPrimeVolumeOverride },
+    { MSG_ID_TD_BLOOD_PRIME_PUBLISH_INTERVAL_OVERRIDE_REQUEST,          &testBloodPrimePublishIntervalOverride },
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLER_LOOKUP) / sizeof(MSG_HANDLER_LOOKUP_T))