Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -reb0949253d49058defea55b07876920d887d7f78 -r791b25bd20e80fce8c5d7e8a3ac37d8395f2315c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision eb0949253d49058defea55b07876920d887d7f78)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 791b25bd20e80fce8c5d7e8a3ac37d8395f2315c)
@@ -1696,9 +1696,14 @@
 
     if ( TRUE == didTimeout( bloodLeakDebubbleStartTimeMS, BLOOD_LEAK_DETECTOR_DEBUBBLE_TIMEOUT_MS ) )
     {
-        if ( TRUE == zeroBloodLeak() )
+        signalDialInPumpHardStop();
+
+        if ( FALSE == isDialInPumpRunning() )
         {
-            state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+            if ( TRUE == zeroBloodLeak() )
+            {
+                state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+            }
         }
     }
 
@@ -1735,7 +1740,12 @@
     {
         if ( TRUE == hasBloodLeakZeroSequenceFailed() )
         {
-            activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED );
+#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
         {
@@ -1747,15 +1757,6 @@
         }
     }
 
-#ifndef _RELEASE_
-    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) ) )
-    {
-        settleStartTime     = getMSTimerCount();
-        isValvesSettingSent = FALSE;
-        state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
-    }
-#endif
-
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         state = WET_SELF_TESTS_STOPPED_STATE;