Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -ra75923f40bea362b44fc082ce8eebde7bfa97c9a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a75923f40bea362b44fc082ce8eebde7bfa97c9a)
@@ -892,18 +892,6 @@
 DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
 
 /*************************************************************************
- * @brief
- * The handleTestLoadCellOverrideRequest function handles a request to \n
- * override the value read from the given load cell.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride )
-
-/*************************************************************************
  * @brief handleSetRTCTimestamp
  * The handleSetRTCTimestamp function handles a request to write time and
  * date to RTC
@@ -933,44 +921,110 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-// MSG_ID_PRESSURE_OVERRIDE:
-void handleTestPressureSensorOverrideRequest( MESSAGE_T *message )
-{
+/*************************************************************************
+ * @brief
+ * The handleTestLoadCellOverrideRequest function handles a request to \n
+ * override the value read from the given load cell.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( BOOL, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride )
 
-}
+/*************************************************************************
+ * @brief
+ * The handleTestLoadCellDataBroadcastIntervalOverrideRequest function handles \n
+ * a request to override the broadcast interval for load cell data.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestLoadCellDataBroadcastIntervalOverrideRequest, testSetLoadCellDataPublishIntervalOverride, testResetLoadCellDataPublishIntervalOverride )
 
-// MSG_ID_PRESSURE_SEND_INTERVAL_OVERRIDE:
-void handleTestPressureDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
-{
+/*************************************************************************
+ * @brief
+ * The handleTestPressureSensorOverrideRequest function handles a request to \n
+ * override the value read from the given pressure sensor.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_F32( BOOL, handleTestPressureSensorOverrideRequest, testSetDGPressureSensorOverride, testResetDGPressureSensorOverride )
 
-}
+/*************************************************************************
+ * @brief
+ * The handleTestPressureDataBroadcastIntervalOverrideRequest function handles \n
+ * a request to override the broadcast interval for load cell data.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestPressureDataBroadcastIntervalOverrideRequest, testSetPressuresDataPublishIntervalOverride, testResetPressuresDataPublishIntervalOverride )
 
-// MSG_ID_RO_PUMP_SET_PT_OVERRIDE:
-void handleTestROPumpSetPointOverrideRequest( MESSAGE_T *message )
-{
+/*************************************************************************
+ * @brief
+ * The handleTestROPumpSetPointOverrideRequest function handles a request to \n
+ * override the RO pump pressure set point (in PSI).
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestROPumpSetPointOverrideRequest, testSetTargetROPumpPressureOverride, testResetTargetROPumpPressureOverride )
 
-}
+/*************************************************************************
+ * @brief
+ * The handleTestROMeasuredFlowOverrideRequest function handles a request to \n
+ * override the RO flow rate.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_F32( BOOL, handleTestROMeasuredFlowOverrideRequest, testSetMeasuredROFlowRateOverride, testResetMeasuredROFlowRateOverride )
 
-// MSG_ID_RO_MEASURED_FLOW_OVERRIDE:
-void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message )
-{
+/*************************************************************************
+ * @brief
+ * The handleTestROPumpDataBroadcastIntervalOverrideRequest function handles \n
+ * a request to override the broadcast interval for RO pump data.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpDataBroadcastIntervalOverrideRequest, testSetROPumpDataPublishIntervalOverride, testResetROPumpDataPublishIntervalOverride )
 
-}
+/*************************************************************************
+ * @brief
+ * The handleTestDrainPumpSetPointOverrideRequest function handles a request to \n
+ * override the drain pump speed set point (in RPM).
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestDrainPumpSetPointOverrideRequest, testSetTargetDrainPumpPressureOverride, testResetTargetDrainPumpPressureOverride )
 
-// MSG_ID_RO_PUMP_SEND_INTERVAL_OVERRIDE:
-void handleTestROPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
-{
-
-}
-
-// MSG_ID_DRAIN_PUMP_SET_PT_OVERRIDE:
-void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message )
-{
-
-}
-
-// MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
-void handleTestDrainPumpDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
-{
-
-}
+/*************************************************************************
+ * @brief
+ * The handleTestDrainPumpDataBroadcastIntervalOverrideRequest function handles \n
+ * a request to override the broadcast interval for drain pump data.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDrainPumpDataBroadcastIntervalOverrideRequest, testSetDrainPumpDataPublishIntervalOverride, testResetDrainPumpDataPublishIntervalOverride )