Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -r1d962901dee9a2f4efb51aa6907f891b44794daf -r4051f35766d64fc4d0a886a55dea60bd701f56c2
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 1d962901dee9a2f4efb51aa6907f891b44794daf)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 4051f35766d64fc4d0a886a55dea60bd701f56c2)
@@ -64,7 +64,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 -red739313859c21cb0d4cb381ff530d6cde4ea45b -r4051f35766d64fc4d0a886a55dea60bd701f56c2
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ed739313859c21cb0d4cb381ff530d6cde4ea45b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4051f35766d64fc4d0a886a55dea60bd701f56c2)
@@ -1669,6 +1669,7 @@
         U32 epoch;
 
         memcpy( &epoch,  message->payload, sizeof( U32 ) );
+        isEpochValid ( epoch );
         result = setRTCEpoch( epoch );
         if ( FALSE == result )
         {
@@ -5529,6 +5530,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 );