Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r4ddf1777acc4298a9ed034e56b66916256d22c18 -rba78a6ce8e6fae706146c36c361b6680b2657642
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4ddf1777acc4298a9ed034e56b66916256d22c18)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ba78a6ce8e6fae706146c36c361b6680b2657642)
@@ -5040,13 +5040,13 @@
  *************************************************************************/
 void handleSetBloodLeakStatusOverrideRequest( 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 = testSetBloodLeakStatusOverride( (BLOOD_LEAK_STATUS_T)( payload.state.u32 ) );
@@ -5257,6 +5257,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingCapacityOverride( payload.state.f32 );