Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rffaf9f13166d7a9beb4252fad804c488f870aaaa -r53274f1111e3feab9f47e6501f50af074a15838e
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ffaf9f13166d7a9beb4252fad804c488f870aaaa)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 53274f1111e3feab9f47e6501f50af074a15838e)
@@ -127,8 +127,9 @@
 static U32 syringeOcclusionDelayStartTime;                          ///< Used to calculate the 1 second delay time before check for prime occlusion.
 
 static BOOL useHeparin;                                             ///< Flag indicates the user of heparin.
-
 static BOOL selfTestsResumeRequested;                               ///< Flag indicates user requesting self-tests resume.
+static BOOL cartridgeUsedTestRun;                                   ///< Flag indicates whether the used cartridge test has been run.
+static BOOL doorStateAfterCartridgeInstall;                         ///< Flag indicates state of front door for saline clamp check after cartridge installed.
 
 // ********** private function prototypes **********
 
@@ -184,6 +185,7 @@
     selfTestStartTime = 0;
     selfTestPreviousPublishDataTime = 0;
     syringeOcclusionDelayStartTime = 0;
+    doorStateAfterCartridgeInstall = TRUE;
 }
 
 /*********************************************************************//**
@@ -405,8 +407,9 @@
  * @brief
  * The transitionToDrySelfTests function resets anything required before
  * the start of dry self-tests.
- * @details Inputs: none
- * @details Outputs: Dry self-tests re-initialized.
+ * @details Inputs: front door state
+ * @details Outputs: Dry self-tests re-initialized, VBA state changed depending
+ * on front door state
  * @return none
  *************************************************************************/
 void transitionToDrySelfTests()
@@ -417,6 +420,7 @@
     previousNormalArterialPressure = 0.0;
     previousNormalVenousPressure = 0.0;
     dryPressureTestsCompleted = FALSE;
+    cartridgeUsedTestRun = FALSE;
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
     selfTestCartridgeSettleTime = getMSTimerCount();
@@ -432,7 +436,14 @@
     setValveAirTrap( STATE_CLOSED );
     setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
-    setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
+    if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
+    {
+        setValvePosition( VBA, VALVE_POSITION_B_OPEN );
+    }
+    else
+    {
+        setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
+    }
     setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
 
     resetSelfTestsFlags();
@@ -930,6 +941,8 @@
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_START_STATE;
     OPN_CLS_STATE_T pumpTrack    = getSwitchStatus( PUMP_TRACK_SWITCH );
 
+    handleDoorCloseAfterCartridgeInsertion(); // want to pinch off saline once door closed after cartridge install
+
     if ( STATE_CLOSED == pumpTrack )
     {
         // Ensure occlusion sensor has time to settle after cartridge insertion before starting dry self-tests
@@ -975,7 +988,7 @@
         state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-        setValvePosition( VBA, VALVE_POSITION_C_CLOSE );
+        setValvePosition( VBA, VALVE_POSITION_B_OPEN );
         setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
     }
 
@@ -993,7 +1006,7 @@
  * The handleDrySelfTestUsedCartridgeCheckState function verify no fluid is
  * detected by bubble detectors to ensure the cartridge is new.
  * @details Inputs: none
- * @details Outputs: none
+ * @details Outputs: cartridgeUsedTestRun
  * @return the next state of dry self-tests state machine
  *************************************************************************/
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedCartridgeCheckState( void )
@@ -1015,6 +1028,7 @@
         {
             // If either of the test configurations are set go to loaded check
             state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE;
+            cartridgeUsedTestRun = TRUE;
         }
         else
         {
@@ -1528,7 +1542,15 @@
         else
         {
             doorClosedRequired( FALSE, TRUE );
-            state = DRY_SELF_TESTS_START_STATE;
+            setValvePosition( VBA, VALVE_POSITION_B_OPEN );
+            if ( TRUE == cartridgeUsedTestRun )
+            {
+                state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE;
+            }
+            else
+            {
+                state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+            }
         }
     }
 
@@ -2019,4 +2041,29 @@
     return state;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleDoorCloseAfterCartridgeInsertion function handles the check
+ * for door close after cartridge install so that saline line can be pinched.
+ * @details Inputs: door and latch states, doorStateAfterCartridgeInstall
+ * @details Outputs: doorStateAfterCartridgeInstall
+ * @return none
+ *************************************************************************/
+void handleDoorCloseAfterCartridgeInsertion( void )
+{
+    OPN_CLS_STATE_T frontDoor           = getSwitchStatus( FRONT_DOOR );
+    OPN_CLS_STATE_T pumpTrack           = getSwitchStatus( PUMP_TRACK_SWITCH );
+
+    if ( ( STATE_OPEN == frontDoor ) && ( TRUE == doorStateAfterCartridgeInstall ) )
+    {
+        doorStateAfterCartridgeInstall = FALSE;
+    }
+    // when transitioning from door open to door closed, pinch off saline bag to prevent saline from running up the line
+    if ( ( STATE_CLOSED == frontDoor ) && ( STATE_CLOSED == pumpTrack ) && ( FALSE == doorStateAfterCartridgeInstall ) )
+    {
+        setValvePosition( VBA, VALVE_POSITION_B_OPEN );
+        doorStateAfterCartridgeInstall = TRUE;
+    }
+}
+
 /**@}*/