Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rd1734c851c8beeba934d0e1f4727eefb797ee2e2 -r6c8d2046582b6d2c4d0a8b4a97c51b89f80ecf7b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d1734c851c8beeba934d0e1f4727eefb797ee2e2)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6c8d2046582b6d2c4d0a8b4a97c51b89f80ecf7b)
@@ -4381,20 +4381,20 @@
  *************************************************************************/
 void handleTestArterialPressureOverrideRequest( 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 = testSetArterialPressureOverride( payload.state.f32 );
+            result = testSetArterialPressureOverride( payload.state.f32, payload.index );
         }
         else
         {
-            result = testResetArterialPressureOverride();
+            result = testResetArterialPressureOverride( payload.index );
         }
     }
 
@@ -4413,20 +4413,20 @@
  *************************************************************************/
 void handleTestVenousPressureOverrideRequest( 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 = testSetVenousPressureOverride( payload.state.f32 );
+            result = testSetVenousPressureOverride( payload.state.f32, payload.index );
         }
         else
         {
-            result = testResetVenousPressureOverride();
+            result = testResetVenousPressureOverride( payload.index );
         }
     }