Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r8ba790d6f8c2c539fdf43594a0a99cbee8f58978 -r56551a81794c222eaf78d1e2e06737490c0a80a7
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8ba790d6f8c2c539fdf43594a0a99cbee8f58978)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 56551a81794c222eaf78d1e2e06737490c0a80a7)
@@ -221,7 +221,7 @@
  * @brief
  * The setupForSelfTestsStop function sets actuators appropriately for self-tests
  * states.
- * @details Inputs: none
+ * @details Inputs: dryPressureTestsCompleted, PreTreatmentSubState
  * @details Outputs: All pumps stopped
  * @return none
  *************************************************************************/
@@ -247,7 +247,7 @@
 
     // If the HD has finished no cart s.t. but not dry pressure tests, Open VBT to vent pressure
     // to prevent air going to the Saline bag.
-    if ( ( NO_CART_SELF_TESTS_COMPLETE_STATE == currentNoCartSelfTestsState ) && ( FALSE == dryPressureTestsCompleted ) )
+    if ( ( HD_PRE_TREATMENT_SELF_TEST_DRY_STATE == getPreTreatmentSubState() ) && ( FALSE == dryPressureTestsCompleted ) )
     {
         setValvePosition( VBA, VALVE_POSITION_B_OPEN );
         setValveAirTrap( STATE_OPEN );
@@ -1615,7 +1615,7 @@
 
     // Set VBA to Pos A and close VBT after we have
     // depressurized the line from failed pressure self tests.
-    if ( ( TRUE == isAnyAlarmActive() ) && ( FALSE == dryPressureTestsCompleted ) )
+    if ( FALSE == dryPressureTestsCompleted )
     {
         if ( getFilteredVenousPressure() <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG )
         {