Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rd7a0b724094ed5c6f3e4d88b4d076c9a5c97c810 -r7960836f635257a147fc30524d37fc7dfa38e967
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d7a0b724094ed5c6f3e4d88b4d076c9a5c97c810)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7960836f635257a147fc30524d37fc7dfa38e967)
@@ -1549,8 +1549,6 @@
     {
         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;
         }
     }
@@ -1730,7 +1728,7 @@
         else
         {
 #ifndef _RELEASE_
-            if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE ) )
+            if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) ) )
             {
                 state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
             }