Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2c70c24f7c5ead2322ec56f740277f0654ad281a -rdaa921813b1d41e7db764dd32e7748db1c3d047f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2c70c24f7c5ead2322ec56f740277f0654ad281a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision daa921813b1d41e7db764dd32e7748db1c3d047f)
@@ -3500,20 +3500,20 @@
 *************************************************************************/
 void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetDrainPumpMeasuredRPMOverride( payload.state.u32 );
+            result = testSetDrainPumpMeasuredRPMOverride( payload.index, payload.state.u32 );
         }
         else
         {
-            result = testResetDrainPumpMeasuredRPMOverride();
+            result = testResetDrainPumpMeasuredRPMOverride( payload.index );
         }
     }
 
@@ -3887,38 +3887,6 @@
 }
 
 /*********************************************************************//**
-* The handleTestDGDrainPumpCurrentOverrideRequest function handles a
-* request to override the drain pump measured current.
-* @details Inputs: none
-* @details Outputs: message handled
-* @param message a pointer to the message to handle
-* @return none
-*************************************************************************/
-void handleTestDGDrainPumpCurrentOverrideRequest( 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 = testSetDrainPumpMeasuredCurrentOverride( payload.state.f32 );
-        }
-        else
-        {
-            result = testResetDrainPumpMeasuredCurrentOverride();
-        }
-    }
-
-    // Respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * The handleTestDGDrainPumpDirectionOverrideRequest function handles a
 * request to override the drain pump measured direction.
 * @details Inputs: none