Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r5b448e81db260e5b041699a83c6f2a3faa260ea9 -r234c2cedfa38520fa523a29156de993e9ace9a79
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 5b448e81db260e5b041699a83c6f2a3faa260ea9)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 234c2cedfa38520fa523a29156de993e9ace9a79)
@@ -603,18 +603,21 @@
 {
     BLOOD_LEAK_STATE_T state = BLOOD_LEAK_SELF_TEST_STATE;
 
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
     if ( SELF_TEST_STATUS_IN_PROGRESS == bloodLeakSelfTestStatus )
     {
         if ( FALSE == noFPGABloodLeakDetected() ) // Faked blood leak caused by independent MCU board
         {
             bloodLeakSelfTestStatus = SELF_TEST_STATUS_PASSED;
             clearFPGABloodLeakSelfTest();
         }
+
         else if ( TRUE == didTimeout( bloodLeakSelfTestStartTime, BLOOD_LEAK_TIMEOUT_MS ) )
         {
             bloodLeakSelfTestStatus = SELF_TEST_STATUS_FAILED;
-
+#ifndef IGNORE_BLOOD_LEAK_ALARM
             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE );
+#endif
         }
     }
     else
@@ -625,6 +628,7 @@
             state = BLOOD_LEAK_NORMAL_STATE;
         }
     }
+#endif
 
     return state;
 }
Index: firmware/App/Controllers/BloodLeak.h
===================================================================
diff -u -r5b448e81db260e5b041699a83c6f2a3faa260ea9 -r234c2cedfa38520fa523a29156de993e9ace9a79
--- firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 5b448e81db260e5b041699a83c6f2a3faa260ea9)
+++ firmware/App/Controllers/BloodLeak.h	(.../BloodLeak.h)	(revision 234c2cedfa38520fa523a29156de993e9ace9a79)
@@ -65,7 +65,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/Controllers/SyringePump.c
===================================================================
diff -u -r5b448e81db260e5b041699a83c6f2a3faa260ea9 -r234c2cedfa38520fa523a29156de993e9ace9a79
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 5b448e81db260e5b041699a83c6f2a3faa260ea9)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 234c2cedfa38520fa523a29156de993e9ace9a79)
@@ -90,6 +90,7 @@
 
 /// Expected position of empty in relation to home position.
 #define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84F )
+
 /// Margin of error for empty position determination.
 #define SYRINGE_PUMP_EMPTY_POS_MARGIN                 ( SYRINGE_ENCODER_COUNTS_PER_ML * 0.5F )
 /// Minimum retract position.
@@ -1918,6 +1919,7 @@
  *************************************************************************/
 
 
+
 /*********************************************************************//**
  * @brief
  * The testSetSyringePumpDataPublishIntervalOverride function overrides the
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r5b448e81db260e5b041699a83c6f2a3faa260ea9 -r234c2cedfa38520fa523a29156de993e9ace9a79
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 5b448e81db260e5b041699a83c6f2a3faa260ea9)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 234c2cedfa38520fa523a29156de993e9ace9a79)
@@ -516,7 +516,7 @@
 
         // If the wait time has elapsed, trigger a fill command
         // TODO uncomment
-        //if ( timeWaitToFillMS <= 0 )
+        if ( timeWaitToFillMS <= 0 )
         // TODO uncomment
         {
             cmdStartDGFill( FILL_RESERVOIR_TO_VOLUME_ML, targetFillFlowRateLPM );