Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r486f68528804a67c4632bb7fd530fae4cb63cd36 -rf9521503c0e00e84b298983d954e8dd000d93c17
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 486f68528804a67c4632bb7fd530fae4cb63cd36)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f9521503c0e00e84b298983d954e8dd000d93c17)
@@ -91,6 +91,8 @@
 #define PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG        10.0F                                   ///< Prior to dry pressure leak test, arterial and venous pressure sensors should read zero +/- this tolerance.
 #define MAX_EMPTY_RESERVOIR_WEIGHT_G                        15.0F                                   ///< Maximum reservoir weight to be considered empty for cartridge pressure leak test.
 
+#define BLOOD_LEAK_DETECTOR_DEBUBBLE_TIMEOUT_MS             ( 5 * MS_PER_SECOND )                   ///< Blood leak detector debubble timeout in milliseconds.
+
 // ********** private data **********
 
 static NO_CART_SELF_TESTS_STATE_T currentNoCartSelfTestsState;      ///< Current state of the no cartridge self-tests state machine.
@@ -125,6 +127,7 @@
 static U32 selfTestStartTime;                                       ///< Starting time of self-test (in ms).
 static U32 selfTestPreviousPublishDataTime;                         ///< Last time self-test time data is being published (in ms).
 static U32 syringeOcclusionDelayStartTime;                          ///< Used to calculate the 1 second delay time before check for prime occlusion.
+static U32 bloodLeakDebubbleStartTimeMS;                            ///< Blood leak detector debubble start time in milliseconds.
 
 static BOOL useHeparin;                                             ///< Flag indicates the user of heparin.
 
@@ -163,6 +166,7 @@
 static WET_SELF_TESTS_STATE_T handleWetSelfTestSetupState( void );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestBubblesState( void );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestPrimeCheckState( void );
+static WET_SELF_TESTS_STATE_T handleWetSelfTestBloodLeakDetectorDebubbleState( void );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestBloodLeakDetectorState( void );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestFirstDisplacementSetupState( void );
 static WET_SELF_TESTS_STATE_T handleWetSelfTestFirstDisplacementState( void );
@@ -580,6 +584,7 @@
     isValvesSettingSent = FALSE;
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
+    bloodLeakDebubbleStartTimeMS = getMSTimerCount();
 
     // Pumps should be off
     signalBloodPumpHardStop();
@@ -635,6 +640,10 @@
             currentWetSelfTestsState = handleWetSelfTestPrimeCheckState();
             break;
 
+        case WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_DEBUBBLE_STATE:
+            currentWetSelfTestsState = handleWetSelfTestBloodLeakDetectorDebubbleState();
+            break;
+
         case WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE:
             currentWetSelfTestsState = handleWetSelfTestBloodLeakDetectorState();
             break;
@@ -1642,19 +1651,6 @@
         {
             state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
         }
-        else
-        {
-#ifndef _RELEASE_
-            if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) ) )
-            {
-                state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
-            }
-            else
-#endif
-            {
-                activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED );
-            }
-        }
     }
     else
     {
@@ -1672,22 +1668,79 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleWetSelfTestBloodLeakDetectorDebubbleState function runs the
+ * dialin pump in bypass mode to remove the potential bubbles from the
+ * blood leak detector prior to command another zero sequence.
+ * @details Inputs: bloodLeakDebubbleStartTimeMS
+ * @details Outputs: none
+ * @return the next state of wet self-tests state machine
+ *************************************************************************/
+static WET_SELF_TESTS_STATE_T handleWetSelfTestBloodLeakDetectorDebubbleState( void )
+{
+    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_DEBUBBLE_STATE;
+
+    if ( TRUE == didTimeout( bloodLeakDebubbleStartTimeMS, BLOOD_LEAK_DETECTOR_DEBUBBLE_TIMEOUT_MS ) )
+    {
+        signalDialInPumpHardStop();
+
+        if ( FALSE == isDialInPumpRunning() )
+        {
+            if ( TRUE == zeroBloodLeak() )
+            {
+                state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+            }
+        }
+    }
+
+    if ( TRUE == doesAlarmStatusIndicateStop() )
+    {
+        state = WET_SELF_TESTS_STOPPED_STATE;
+        setupForSelfTestsStop();
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleWetSelfTestBloodLeakDetectorState function handles zeroing and
  * self-test for blood leak detector.
  * @details Inputs: none
- * @details Outputs: next self-test state
+ * @details Outputs: bloodLeakDebubbleStartTimeMS, settleStartTime,
+ * isValvesSettingSent
  * @return the next state of wet self-tests state machine
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestBloodLeakDetectorState( void )
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+    SELF_TEST_STATUS_T status    = getBloodLeakSelfTestStatus();
 
-    if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() )
+    if ( SELF_TEST_STATUS_PASSED == status )
     {
         settleStartTime     = getMSTimerCount();
         isValvesSettingSent = FALSE;
         state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
     }
+    else if ( SELF_TEST_STATUS_FAILED == status )
+    {
+        if ( TRUE == hasBloodLeakZeroSequenceFailed() )
+        {
+#ifndef _RELEASE_
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_ALARM ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+            {
+                activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED );
+            }
+        }
+        else
+        {
+            setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
+            setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
+            setDialInPumpTargetFlowRate( DIALYSATE_FLOW_RATE_FOR_RECIRC, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            bloodLeakDebubbleStartTimeMS = getMSTimerCount();
+            state                        = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_DEBUBBLE_STATE;
+        }
+    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {