Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf4545d449a2a2f9353307a55d2bce9e150591c3d -rc84daa1f07003427fc5cdde8f5651434478f7313
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f4545d449a2a2f9353307a55d2bce9e150591c3d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c84daa1f07003427fc5cdde8f5651434478f7313)
@@ -1713,32 +1713,6 @@
 }
 
 /*************************************************************************
- * @brief handleTestHDMessageRequest
- * The handleTestHDMessageRequest function handles a request to add an \n
- * HD message to the received message queue.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestHDMessageRequest( MESSAGE_T *message )
-{
-    MESSAGE_WRAPPER_T hdMessage;
-    U32 msgLen = (U32)(message->hdr.payloadLen);
-    U08 *msgBytes = (U08*)(&(hdMessage));
-    BOOL result;
-
-    memcpy( msgBytes, message->payload, msgLen );
-
-    // add HD message to received message queue
-    result = addToMsgQueue( MSG_Q_IN, &hdMessage );
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*************************************************************************
  * @brief handleTestOffButtonStateOverrideRequest
  * The handleTestOffButtonStateOverrideRequest function handles a request to \n
  * override the state of the off button.
@@ -1832,7 +1806,27 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestBloodFlowSetPointOverrideRequest, testSetTargetBloodFlowRateOverride, testResetTargetBloodFlowRateOverride )
+void handleTestBloodFlowSetPointOverrideRequest( MESSAGE_T *message )
+{
+    OVERRIDE_PUMP_SET_PT_PAYLOAD_T payload;
+    BOOL result = 0;
+
+    /* verify payload length */
+    if ( sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetTargetBloodFlowRateOverride( payload.setPt, payload.ctrlMode );
+        }
+        else
+        {
+            result = testResetTargetBloodFlowRateOverride();
+        }
+    }
+    /* respond to request */
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
 
 /*************************************************************************
  * @brief handleTestBloodFlowMeasuredOverrideRequest
@@ -1916,8 +1910,60 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestDialInFlowSetPointOverrideRequest, testSetTargetDialInFlowRateOverride, testResetTargetDialInFlowRateOverride )
+void handleTestDialInFlowSetPointOverrideRequest( MESSAGE_T *message )
+{
+    OVERRIDE_PUMP_SET_PT_PAYLOAD_T payload;
+    BOOL result = 0;
+
+    /* verify payload length */
+    if ( sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
+        if ( 0 == payload.reset )
+        {
+            result = testSetTargetDialInFlowRateOverride( payload.setPt, payload.ctrlMode );
+        }
+        else
+        {
+            result = testResetTargetDialInFlowRateOverride();
+        }
+    }
+    /* respond to request */
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
 
+/*************************************************************************
+ * @brief
+ * The handleTestDialOutFlowSetPointOverrideRequest function handles a request to \n
+ * override the set point for the dialysate outlet flow rate (mL/min).
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestDialOutFlowSetPointOverrideRequest( MESSAGE_T *message )
+{
+    OVERRIDE_PUMP_SET_PT_PAYLOAD_T payload;
+    BOOL result = 0;
+
+    /* verify payload length */
+    if ( sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(OVERRIDE_PUMP_SET_PT_PAYLOAD_T) );
+        if ( 0 == payload.reset )
+        {
+            result = testSetTargetDialOutFlowRateOverride( payload.setPt, payload.ctrlMode );
+        }
+        else
+        {
+            result = testResetTargetDialOutFlowRateOverride();
+        }
+    }
+    /* respond to request */
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*************************************************************************
  * @brief handleTestDialInFlowMeasuredOverrideRequest
  * The handleTestDialInFlowMeasuredOverrideRequest function handles a request to \n