Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r68567afef43364044dabe0cd91fc2933f0b331ac -r1d49abd3736a0e21a9ceb56e213d4337fbb8138c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 68567afef43364044dabe0cd91fc2933f0b331ac)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1d49abd3736a0e21a9ceb56e213d4337fbb8138c)
@@ -1260,7 +1260,6 @@
 
     if ( ( arterialPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) && ( venousPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) )
     {
-        signalActionToResumeFill();
         state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
     }
 
@@ -1321,6 +1320,7 @@
     }
     else
     {
+        signalActionToResumeFill();
         state = DRY_SELF_TESTS_COMPLETE_STATE;
     }
 
@@ -1533,14 +1533,21 @@
 
     if ( BUBBLE_NOT_DETECTED == ADVBubbleStatus )
     {
+        if ( TRUE == zeroBloodLeak() )
+        {
+            state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+        }
+        else
+        {
 #ifndef _RELEASE_
-        if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) &&
-             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK ) != SW_CONFIG_ENABLE_VALUE ) )
+            if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE ) )
+            {
+                state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
+            }
+            else
 #endif
-        {
-            if ( TRUE == zeroBloodLeak() )
             {
-                state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
+                activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED );
             }
         }
     }