Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf6b78d1fe6741043de38707211710ab0e8a08483 -r23016be42e59935da5aa53b26b8cb31e2a240858
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 23016be42e59935da5aa53b26b8cb31e2a240858)
@@ -1004,7 +1004,8 @@
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
-                    state = DRY_SELF_TESTS_COMPLETE_STATE;
+                    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
                 {
@@ -1013,12 +1014,8 @@
             }
             else
             {
-                if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
+                if ( TRUE == isSyringePumpHome() )
                 {
-                    retractSyringePump();
-                }
-                else if ( TRUE == isSyringePumpHome() )
-                {
                     seekSyringePlunger();
                 }
             }