Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r1943944469d5a9f841f366ef9d8969c3072bd7ab -rfbc0a281b094ff309dcbf83db1878818a9b384f1
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 1943944469d5a9f841f366ef9d8969c3072bd7ab)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision fbc0a281b094ff309dcbf83db1878818a9b384f1)
@@ -61,7 +61,7 @@
 // ********** private data **********
 
 static BOOL testerLoggedIn = FALSE;                 ///< Flag indicates whether tester logged in or not.
-static volatile U16 nextSeqNo = 1;                  ///< Next sequence number.
+static volatile U16 nextSeqNo = 1;                  ///< Next sequence number.
 
 // ********** private function prototypes **********
 
@@ -1474,38 +1474,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestDrainPumpSetPointOverrideRequest function handles a request to
- * override the drain pump speed set point (in RPM).
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestDrainPumpSetPointOverrideRequest( 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 = testSetTargetDrainPumpSpeedOverride( payload.state.u32 );
-        }
-        else
-        {
-            result = testResetTargetDrainPumpSpeedOverride();
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestDrainPumpDataBroadcastIntervalOverrideRequest function handles
  * a request to override the broadcast interval for drain pump data.
  * @details Inputs: none
@@ -1971,24 +1939,25 @@
 
 /*********************************************************************//**
 * @brief
-* The handleROPumpDutyCycleOverride function handles a request to override
+* The handleTestROPumpDutyCycleOverride function handles a request to override
 * the RO pumps duty cycle.
 * @details Inputs: none
 * @details Outputs: message handled
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-void handleROPumpDutyCycleOverride( MESSAGE_T *message )
+void handleTestROPumpDutyCycleOverride( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
      BOOL result = FALSE;
 
      // verify payload length
-     if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+     if ( sizeof( F32 ) == message->hdr.payloadLen )
      {
-         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+         F32 payLoad;
 
-         result = testSetTargetDutyCycle( payload.state.f32 );
+         memcpy( &payLoad, message->payload, sizeof( F32 ) );
+
+         result = testSetTargetDutyCycle( payLoad );
      }
 
      // respond to request
@@ -1997,22 +1966,22 @@
 
 /*********************************************************************//**
 * @brief
-* The handleROFlowRateOverride function handles a request to override
+* The handleTestROFlowRateOverride function handles a request to override
 * the RO flow rate.
 * @details Inputs: none
 * @details Outputs: message handled
 * @param message a pointer to the message to handle
 * @return none
 *******************************************************************/
-void handleROFlowRateOverride( MESSAGE_T *message )
+void handleTestMeasuredROFlowRateOverride( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
             result = testSetMeasuredROFlowRateOverride( payload.state.f32 );
@@ -2029,24 +1998,24 @@
 
 /*********************************************************************//**
 * @brief
-* The handleROPumpTargetFlowOverride function handles a request to override
-* the RO pump target flow rate.
+* The handleTestROPumpTargetFlowOverride function handles a request to
+* override the RO pump target flow rate.
 * @details Inputs: none
 * @details Outputs: message handled
 * @param message a pointer to the message to handle
 * @return none
 *******************************************************************/
-void handleROPumpTargetFlowOverride( MESSAGE_T *message )
+void handleTestROPumpTargetFlowOverride( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( F32 ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        F32 payload;
 
-        result = setROPumpTargetFlowRate( payload.state.f32, payload.state.f32 );
+        memcpy( &payload, message->payload, sizeof( F32 ) );
+        result = testSetTargetROPumpFlow( payload );
     }
 
     // respond to request
@@ -2064,15 +2033,16 @@
 *******************************************************************/
 void handleROPumpTargetPressureOverride( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        U32 payload;
 
-        result = testSetTargetROPumpPressure( payload.state.f32 );
+        memcpy( &payload, message->payload, sizeof( U32 ) );
+
+        result = testSetTargetROPumpPressure( payload );
     }
 
     // respond to request