Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -rc6cf2c60675a7c9e027cc33ff8521a9a545b2b87 -rb531672fa7e70a0be9e4fa0e9c87bfe3c2628d68
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision c6cf2c60675a7c9e027cc33ff8521a9a545b2b87)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision b531672fa7e70a0be9e4fa0e9c87bfe3c2628d68)
@@ -341,7 +341,7 @@
 {
     BLOOD_LEAK_STATES_T state = BLOOD_LEAK_SELF_TEST_STATE;
 
-#ifndef IGNORE_BLOOD_LEAK_ALARM
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
     if ( SELF_TEST_STATUS_IN_PROGRESS == bloodLeakSelfTestStatus )
     {
         if ( FALSE == noFPGABloodLeakDetected() ) // Faked blood leak caused by independent MCU board
Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -r6982379266891326c9d45aecd7d54ad5c85ea69f -rb531672fa7e70a0be9e4fa0e9c87bfe3c2628d68
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 6982379266891326c9d45aecd7d54ad5c85ea69f)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision b531672fa7e70a0be9e4fa0e9c87bfe3c2628d68)
@@ -63,7 +63,7 @@
 void zeroBloodLeak( 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/HDCommon.h
===================================================================
diff -u -r743c59a111321a8c51320ee27e16e01592838991 -rb531672fa7e70a0be9e4fa0e9c87bfe3c2628d68
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 743c59a111321a8c51320ee27e16e01592838991)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision b531672fa7e70a0be9e4fa0e9c87bfe3c2628d68)
@@ -85,7 +85,7 @@
     #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
 //    #define SKIP_RESERVOIR_ALARMS           1           // Skip reservoir management alarms
     #define IGNORE_BLOOD_LEAK_SELF_TEST     1           // Ignore blood leak self test
-    #define IGNORE_BLOOD_LEAK_ALARM         1           // Ignore blood leak alarm
+ //   #define IGNORE_BLOOD_LEAK_ALARM         1           // Ignore blood leak alarm
 
     // Skip Pre-Treatment and get to treatment as soon as possible
 //    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.