Index: firmware/App/Services/StateServices/DrySelfTests.c
===================================================================
diff -u -r3479c42f6bf13fb6c565cc48ba13936e1ec22be9 -ra43e8d7086cdfa6f6208306e5b23de13ffb8a014
--- firmware/App/Services/StateServices/DrySelfTests.c	(.../DrySelfTests.c)	(revision 3479c42f6bf13fb6c565cc48ba13936e1ec22be9)
+++ firmware/App/Services/StateServices/DrySelfTests.c	(.../DrySelfTests.c)	(revision a43e8d7086cdfa6f6208306e5b23de13ffb8a014)
@@ -181,47 +181,51 @@
  * on front door state
  * @return none
  *************************************************************************/
-//void transitionToDrySelfTests( void )
-//{
-//    selfTestStartTime               = getMSTimerCount();
-//    selfTestPreviousPublishDataTime = getMSTimerCount();
-//    resetSelfTestsFlags();
-//    doorClosedRequired( TRUE );
-//    // to stop automatic air trap control because Dry Self-Test
-//    // directly controls H13 and H20.
-//   endAirTrapControl();
-//   setCurrentSubState( (U32)currentDrySelfTestsState );
-//   // To configure actuators for the current Dry Self-Test state.
-//   transitionToDrySelfTestsState( currentDrySelfTestsState );
-//}
-
 void transitionToDrySelfTests( void )
 {
-    selfTestStartTime                     = getMSTimerCount();
-    selfTestPreviousPublishDataTime       = getMSTimerCount();
-    doorClosedRequired( TRUE );
-    setCurrentSubState( (U32)currentDrySelfTestsState );
-    transitionToDrySelfTestsState( currentDrySelfTestsState );
+    selfTestStartTime               = getMSTimerCount();
+    selfTestPreviousPublishDataTime = getMSTimerCount();
 
-    signalBloodPumpHardStop();
+    resetSelfTestsFlags();
 
+    doorClosedRequired( TRUE );
+
+    // Dry Self-Test directly controls H13 and H20.
     endAirTrapControl();
-    set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-    set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-    setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
 
-    if ( STATE_CLOSED == getSwitchState( H9_SWCH ) )
-    {
-        setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN );
-    }
-    else
-    {
-        setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
-    }
+    setCurrentSubState( (U32)currentDrySelfTestsState );
 
-    resetSelfTestsFlags();
+    // Configure actuators for the initial Dry Self-Test state.
+    transitionToDrySelfTestsState( currentDrySelfTestsState );
 }
 
+//void transitionToDrySelfTests( void )
+//{
+//    selfTestStartTime                     = getMSTimerCount();
+//    selfTestPreviousPublishDataTime       = getMSTimerCount();
+//    doorClosedRequired( TRUE );
+//    setCurrentSubState( (U32)currentDrySelfTestsState );
+//    transitionToDrySelfTestsState( currentDrySelfTestsState );
+//
+//    signalBloodPumpHardStop();
+//
+//    endAirTrapControl();
+//    set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+//    set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+//    setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
+//
+//    if ( STATE_CLOSED == getSwitchState( H9_SWCH ) )
+//    {
+//        setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN );
+//    }
+//    else
+//    {
+//        setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
+//    }
+//
+//    resetSelfTestsFlags();
+//}
+
 /*********************************************************************//**
  * @brief
  * The execDrySelfTests function executes the dry self-tests state machine.
@@ -412,12 +416,12 @@
     OPN_CLS_STATE_T door             = getSwitchState( H9_SWCH );
 
     // Want to pinch off saline once door closed after tubing set install
-    handleDoorCloseAfterTubingSetInsertion();
+    //handleDoorCloseAfterTubingSetInsertion();
 
     if ( STATE_CLOSED == door )
     {
         doorClosedRequired( TRUE );
-        state = DRY_SELF_TESTS_USED_TUBING_SET_CHECK_STATE;
+        state = DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE;
     }
 
     return state;