Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r6f2218c22e666aec059afbd60f3d0d268b305ad0 -r3dcee9e3e8351d93d57dcccd97223f513ec488a6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6f2218c22e666aec059afbd60f3d0d268b305ad0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3dcee9e3e8351d93d57dcccd97223f513ec488a6)
@@ -5377,13 +5377,13 @@
  *************************************************************************/
 void handleSetFluidLeakStateOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
             result = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)( payload.state.u32 ) );
@@ -6214,6 +6214,40 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleTestValvesCurrentOverrideRequest function handles a
+ * request to override HD valves' current.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestValvesCurrentOverrideRequest( 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 )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetValvesCurrentOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetValvesCurrentOverride( payload.index );
+        }
+
+        result = testSetValvesCurrentOverride( payload.index, payload.state.f32 );
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleTestAlarmInfoSendIntervalOverrideRequest function handles a
  * request to override the HD alarm information broadcast interval.
  * @details Inputs: none
@@ -6495,7 +6529,36 @@
             result = testResetSyringePumpADCReadCounter();
         }
     }
+}
 
+/*********************************************************************//**
+ * @brief
+ * The handleTestValvesPositionCountOverrideRequest function handles a
+ * request to override HD valves' position in counts.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleTestValvesPositionCountOverrideRequest( 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 )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetValvesPositionCountOverride( payload.index, payload.state.u32 );
+        }
+        else
+        {
+            result = testResetValvesPositionCountOverride( payload.index );
+        }
+    }
+
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }