Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r775f8ad98cccfd06d712ab339d1d88e3e640803c -ra57994f752662abc0aaa8c2cf5c3af47ec2c5a20
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 775f8ad98cccfd06d712ab339d1d88e3e640803c)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a57994f752662abc0aaa8c2cf5c3af47ec2c5a20)
@@ -258,7 +258,7 @@
         useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
     }
 
-    currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;
+    currentNoCartSelfTestsState = NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
     runPumpStartTime = 0;
     havePumpsStartedForNCST = FALSE;
     pumpHomingRequestedForNCST = FALSE;
@@ -296,10 +296,6 @@
     // execute no cartridge self-tests state machine
     switch ( currentNoCartSelfTestsState )
     {
-        case NO_CART_SELF_TESTS_START_STATE:
-            currentNoCartSelfTestsState = NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-            break;
-
         case NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE:
             currentNoCartSelfTestsState = handleNoCartSelfTestsWaitForClosedDoor();
             break;
@@ -1120,7 +1116,7 @@
 
     if ( TRUE == didTimeout( pressureSelfTestVenousTestStartTime, VENOUS_PRESSURE_SELF_TEST_MAX_TEST_TIME ) )
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG );
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, VENOUS_PRESSURE_SELF_TEST_FIRST_PASS_LIMIT_MMHG );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )