Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r75ca74e07e2c9019d208c0adcc4ee28376aa1049 -r356b6e39ee43e291f0ab2df4af1f4cf45318fdbb
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 75ca74e07e2c9019d208c0adcc4ee28376aa1049)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 356b6e39ee43e291f0ab2df4af1f4cf45318fdbb)
@@ -31,7 +31,7 @@
 // ********** private definitions **********
 
 #define BLOOD_LEAK_PUB_INTERVAL          ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )         ///< Interval (ms/task time) at which the blood leak data is published on the CAN bus.
-#define BLOOD_LEAK_TIMEOUT               30                                                 ///< Blood leak detector timeout for zeroing and self-test (15 ms extended edge detection)
+#define BLOOD_LEAK_TIMEOUT_MS            30                                                 ///< Blood leak detector timeout for zeroing and self-test (15 ms extended edge detection)
 
 /// Defined states for the blood leak detector state machine.
 typedef enum BloodLeakStates
@@ -182,7 +182,7 @@
     }
     else
     {
-        if ( TRUE == didTimeout( bloodLeakZeroStartTime, BLOOD_LEAK_TIMEOUT ) )
+        if ( TRUE == didTimeout( bloodLeakZeroStartTime, BLOOD_LEAK_TIMEOUT_MS ) )
         {
             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_FAULT );
         }
@@ -210,7 +210,7 @@
     }
     else
     {
-        if ( TRUE == didTimeout( bloodLeakSelfTestStartTime, BLOOD_LEAK_TIMEOUT ) )
+        if ( TRUE == didTimeout( bloodLeakSelfTestStartTime, BLOOD_LEAK_TIMEOUT_MS ) )
         {
             bloodLeakSelfTestStatus = SELF_TEST_STATUS_FAILED;
             activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE );
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r494fa9614f7ec4cb0f677763c499044336ea8214 -r356b6e39ee43e291f0ab2df4af1f4cf45318fdbb
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 494fa9614f7ec4cb0f677763c499044336ea8214)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 356b6e39ee43e291f0ab2df4af1f4cf45318fdbb)
@@ -598,7 +598,7 @@
 {
     NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE;
 
-    if ( TRUE == getBloodLeakSelfTestStatus() )
+    if ( TRUE == SELF_TEST_STATUS_PASSED )
     {
         state = NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE;
     }