Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b -r00da3d911dcb24b088bf50348fca486a893de306
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 00da3d911dcb24b088bf50348fca486a893de306)
@@ -551,18 +551,21 @@
 {
     BLOOD_LEAK_STATES_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
@@ -573,6 +576,7 @@
             state = BLOOD_LEAK_NORMAL_STATE;
         }
     }
+#endif
 
     return state;
 }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b -r00da3d911dcb24b088bf50348fca486a893de306
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7c0f0fa22adeb8e268ce1197a9de6adf11d5c09b)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 00da3d911dcb24b088bf50348fca486a893de306)
@@ -41,7 +41,7 @@
 
 #define PUMP_RUN_SELF_TEST_TIME_MS                          ( 15 * MS_PER_SECOND )                  ///< Self-test time to run pumps in ms.
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
-#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 3 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
+#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
 
 #define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 5 * MS_PER_SECOND )                   ///< Pressure self-test time to run blood pump in ms.
 #define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
@@ -327,7 +327,7 @@
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -865,10 +865,10 @@
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
+//    else
+//    {
+//        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+//    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
@@ -1013,8 +1013,8 @@
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
+                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 1 second has elapsed
                     state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
-                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 3 seconds has elapsed
                 }
                 else
                 {
@@ -1058,11 +1058,15 @@
 
     if ( TRUE == didTimeout( syringeOcclusionDelayStartTime, SYRINGE_PUMP_OCCLUSION_CHECK_DELAY ) )
     {
-        checkForPrimeOcclusion();
-        state = DRY_SELF_TESTS_COMPLETE_STATE;
+        if ( FALSE == checkForPrimeOcclusion() )  // transition to complete state only when occlusion is removed
+        {
+            // clear the occlusion alarm condition to allow user to resume
+            clearAlarmCondition( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION );  // Resume option will appear
+            state = DRY_SELF_TESTS_COMPLETE_STATE;
+        }
     }
 
-    if ( TRUE == doesAlarmStatusIndicateStop() )
+    if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( FALSE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION ) ) )
     {
         state = DRY_SELF_TESTS_STOPPED_STATE;
         setupForSelfTestsStop();
@@ -1089,6 +1093,7 @@
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
+
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
         {