Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -rf487bb5f87d2e09a94f0a609552f1c93d1efb684 -r20e375e07b6da8a92fbaf7bb46d3a38121d91e36
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision f487bb5f87d2e09a94f0a609552f1c93d1efb684)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 20e375e07b6da8a92fbaf7bb46d3a38121d91e36)
@@ -68,7 +68,7 @@
 SELF_TEST_STATUS_T execBloodLeakSelfTest( void );
 
 BLOOD_LEAK_STATUS_T getBloodLeakStatus( void );
-SELF_TEST_STATUS_T getBloodLeakSelfTestStatus( void );
+SELF_TEST_STATUS_T  getBloodLeakSelfTestStatus( void );
 
 BOOL testSetBloodLeakDataPublishIntervalOverride( U32 value );
 BOOL testResetBloodLeakDataPublishIntervalOverride( void );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf487bb5f87d2e09a94f0a609552f1c93d1efb684 -r20e375e07b6da8a92fbaf7bb46d3a38121d91e36
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f487bb5f87d2e09a94f0a609552f1c93d1efb684)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 20e375e07b6da8a92fbaf7bb46d3a38121d91e36)
@@ -5796,6 +5796,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 );
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rf487bb5f87d2e09a94f0a609552f1c93d1efb684 -r20e375e07b6da8a92fbaf7bb46d3a38121d91e36
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision f487bb5f87d2e09a94f0a609552f1c93d1efb684)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 20e375e07b6da8a92fbaf7bb46d3a38121d91e36)
@@ -952,9 +952,6 @@
 // MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE
 BOOL sendBloodLeakEmbeddedModeCommandResponse( U08 cmd, U32 responseLen, U08* response );
 
-// MSG_ID_HD_SEND_ALARMS_COMMAND
-void handleResendAllAlarmsCommand(  MESSAGE_T* message );
-
 // MSG_ID_HD_BLOOD_PUMP_SET_PWM
 void handleTestBloodPumpSetPWM( MESSAGE_T* message );