Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r221f2d32da9044362aa7a30761e1fc9e7a218a86 -r393fa8c04b3d7fddd929080488bc2ee68042837e
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 221f2d32da9044362aa7a30761e1fc9e7a218a86)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 393fa8c04b3d7fddd929080488bc2ee68042837e)
@@ -660,7 +660,7 @@
         // Check for occlusion in Treatment modes where pumps are moving
         else if ( MODE_TREA == getCurrentOperationMode() )
         {
-            if ( ( TRUE == isBloodPumpRunning() ) && TREATMENT_STOP_STATE != getTreatmentState() )
+            if ( TRUE == isBloodPumpRunning() )
             {
                 // Check for occlusion
                 if ( bpOccl > ( OCCLUSION_THRESHOLD_OFFSET + bloodPumpOcclusionAfterCartridgeInstall ) )
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r1e7652badd046606a884e28957f245ffc8e3c174 -r393fa8c04b3d7fddd929080488bc2ee68042837e
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1e7652badd046606a884e28957f245ffc8e3c174)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 393fa8c04b3d7fddd929080488bc2ee68042837e)
@@ -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 );
@@ -419,21 +420,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:
@@ -891,6 +878,41 @@
 
 /*********************************************************************//**
  * @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
+#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;
+            }
+        }
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDrySelfTestWaitForDoorCloseState function makes sure door is
  * closed before starting self-tests.
  * @details Inputs: none
@@ -906,8 +928,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 );
@@ -1451,11 +1472,10 @@
 
     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_