Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -rc27b1788cee92bcb143d6c4f09d4b278ddded36f -r7abbb238d02b3dfa1d60940e557d0ade0f1b53cc
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision c27b1788cee92bcb143d6c4f09d4b278ddded36f)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 7abbb238d02b3dfa1d60940e557d0ade0f1b53cc)
@@ -69,7 +69,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/Modes/Dialysis.c
===================================================================
diff -u -r00ff72e0b1cf3002e660d850346e26e1209e2b24 -r7abbb238d02b3dfa1d60940e557d0ade0f1b53cc
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 00ff72e0b1cf3002e660d850346e26e1209e2b24)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 7abbb238d02b3dfa1d60940e557d0ade0f1b53cc)
@@ -1013,7 +1013,6 @@
         // Reset bolus data before we start
         bolusSalineVolumeDelivered_mL = 0.0;
         bolusSalineLastVolumeTimeStamp = getMSTimerCount();
-
         // Bypass dialyzer
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rc27b1788cee92bcb143d6c4f09d4b278ddded36f -r7abbb238d02b3dfa1d60940e557d0ade0f1b53cc
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c27b1788cee92bcb143d6c4f09d4b278ddded36f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7abbb238d02b3dfa1d60940e557d0ade0f1b53cc)
@@ -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 );