Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r1f91b5a53bda942b0967817bbd5e68a499dbf816 -rda80bb6f20eed9b745d635d1721c556e106bd021
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1f91b5a53bda942b0967817bbd5e68a499dbf816)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision da80bb6f20eed9b745d635d1721c556e106bd021)
@@ -134,6 +134,7 @@
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestHomeIdleState( void );
 static NO_CART_SELF_TESTS_STATE_T handleNoCartSelfTestStoppedState( void );
 
+static DRY_SELF_TESTS_STATE_T handleDrySelfTestStartState( void );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestWaitForDoorCloseState( void );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedCartridgeCheckState( void );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsNormalSetupState( void );
@@ -394,7 +395,7 @@
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
-    doorClosedRequired( TRUE, TRUE );
+    doorClosedRequired( FALSE, TRUE );
 
     // Pumps should be off
     signalBloodPumpHardStop();
@@ -427,21 +428,7 @@
     switch ( currentDrySelfTestsState )
     {
         case DRY_SELF_TESTS_START_STATE:
-            // Ensure occlusion sensor has time to settle after cartridge insertion before starting dry self-tests
-            if ( TRUE == didTimeout( selfTestStartTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) )
-            {
-                setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed
-#ifndef _RELEASE_
-                if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
-                {
-                    currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
-                }
-                else
-#endif
-                {
-                    currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-                }
-            }
+            currentDrySelfTestsState = handleDrySelfTestStartState();
             break;
 
         case DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE:
@@ -910,6 +897,52 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleDrySelfTestStartState function makes sure door is
+ * closed before starting self-tests.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return the next state of dry self-tests state machine
+ *************************************************************************/
+static DRY_SELF_TESTS_STATE_T handleDrySelfTestStartState( void )
+{
+    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_START_STATE;
+    OPN_CLS_STATE_T pumpTrack    = getSwitchStatus( PUMP_TRACK_SWITCH );
+
+    if ( STATE_CLOSED == pumpTrack )
+    {
+        // Ensure occlusion sensor has time to settle after cartridge insertion before starting dry self-tests
+        if ( TRUE == didTimeout( selfTestStartTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) )
+        {
+            setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed
+            doorClosedRequired( TRUE, TRUE );
+#ifndef _RELEASE_
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
+            {
+                currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+            }
+            else
+#endif
+            {
+                currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+            }
+        }
+    }
+
+    else
+    {
+        // doorClosedRequired() will trigger alarms if pumpTrack is open
+        if ( TRUE == doesAlarmStatusIndicateStop() )
+        {
+            state = DRY_SELF_TESTS_STOPPED_STATE;
+            setupForSelfTestsStop();
+        }
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDrySelfTestWaitForDoorCloseState function makes sure door is
  * closed before starting self-tests.
  * @details Inputs: none
@@ -925,8 +958,7 @@
     // Restart self-test start time
     selfTestStartTime = getMSTimerCount();
 
-    // TODO: Use appropriate sensor driver
-    if (( STATE_CLOSED == frontDoor ) && (STATE_CLOSED == pumpTrack ) )
+    if ( ( STATE_CLOSED == frontDoor ) && ( STATE_CLOSED == pumpTrack ) )
     {
         state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
@@ -1470,22 +1502,23 @@
 
     doorClosedRequired( FALSE, FALSE );
 
-    // Restart self-test start time
-    selfTestStartTime = getMSTimerCount();
-
     if ( TRUE == selfTestsResumeRequested )
     {
+        // Restart self-test start time
+        selfTestStartTime = getMSTimerCount();
         selfTestsResumeRequested = FALSE;
-        doorClosedRequired( TRUE, TRUE );
+
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
         {
-            state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+            doorClosedRequired( TRUE, TRUE );
+            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
         }
         else
 #endif
         {
-            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+            doorClosedRequired( FALSE, TRUE );
+            state = DRY_SELF_TESTS_START_STATE;
         }
     }