Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r58129c9bb3053c39efa07f60e975f17e2a04755a -rf9b3862d01ce6c64bd05b8649e69b44fa155b8e0
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 58129c9bb3053c39efa07f60e975f17e2a04755a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f9b3862d01ce6c64bd05b8649e69b44fa155b8e0)
@@ -1561,39 +1561,6 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-/*********************************************************************//**
- * @brief
- * The handleTestROPumpSetPointOverrideRequest function handles a request to
- * 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
- *************************************************************************/
-void handleTestROPumpSetPointOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetTargetROPumpPressureOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetTargetROPumpPressureOverride();
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
 /*********************************************************************//**
  * @brief
  * The handleTestROMeasuredFlowOverrideRequest function handles a request to
@@ -1669,7 +1636,7 @@
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestDrainPumpSetPointOverrideRequest( MESSAGE_T *message )
+void handleTestDrainPumpRPMOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -1678,14 +1645,8 @@
     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetTargetDrainPumpRPMOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetTargetDrainPumpRPMOverride();
-        }
+
+        result = testSetTargetDrainPumpRPM( payload.state.u32 );
     }
 
     // respond to request
@@ -1793,17 +1754,28 @@
 
 /*************************************************************************
  * @brief
- * The handleSetDrainPumpDeltaPressure function handles a \n
- * request to override the delta pressure for the drain pump
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
+ * The handleSetDrainPumpDeltaPressureOverrideRequest function handles a
+ * request to override the delta pressure for the drain pump.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleSetDrainPumpDeltaPressureOverrideRequest, \
-                                testSetTargetDrainPumpDeltaPressureOverride, testResetTargetDrainPumpDeltaPressureOverride )
+void handleSetDrainPumpDeltaPressureOverrideRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = 0;
+    /* verify payload length */
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
 
+        result = testSetTargetDrainPumpDeltaPressure( (U32)(payload.state.u32) );
+    }
+    /* respond to request */
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*************************************************************************
  * @brief
  * The handleSetHeatDisinfectRecircStateDurationOverrideRequest function handles a \n
@@ -2344,14 +2316,8 @@
      if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
      {
          memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
-         if ( FALSE == payload.reset )
-         {
-             result = testSetTargetDutyCycleOverride( payload.state.f32 );
-         }
-         else
-         {
-             result = testResetTargetDutyCyceOverride();
-         }
+
+         result = testSetTargetDutyCycle( payload.state.f32 );
      }
 
      // respond to request
@@ -2434,14 +2400,8 @@
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetTargetROPumpPressureOverride( payload.state.f32 );
-        }
-        else
-        {
-            result = testResetTargetROPumpPressureOverride();
-        }
+
+        result = testSetTargetROPumpPressure( payload.state.f32 );
     }
 
     // respond to request