Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r9d8170a50fb293c76c5c1f1875ab3792c2b8fb50 -rced4d5be0d18c9b1001143206d10e09fd15f8efb
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9d8170a50fb293c76c5c1f1875ab3792c2b8fb50)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ced4d5be0d18c9b1001143206d10e09fd15f8efb)
@@ -1004,7 +1004,7 @@
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
         setValvePosition( VBA, VALVE_POSITION_B_OPEN );
-        setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
+        setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
@@ -1035,6 +1035,7 @@
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) &&
          ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) )
     {
+        resetArtVenPressureOffsets();
         state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE;
     }
     else
@@ -1075,10 +1076,11 @@
 
     if ( SELF_TEST_STATUS_PASSED == execPresOcclDryTest() )
     {
+        setArtVenPressureOffsets();
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
         setValvePosition( VBA, VALVE_POSITION_B_OPEN );  // need open path from PBA to VBT
-        setValvePosition( VBV, VALVE_POSITION_B_OPEN );  // need open path from PBA to VBT
+        setValvePosition( VBV, VALVE_POSITION_A_INSERT_EJECT );  // need open path from PBA to VBT
         setValveAirTrap( STATE_OPEN );
         pressureSelfTestPreNormalStartTime = getMSTimerCount();
         state = DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE;
@@ -1566,6 +1568,7 @@
             if ( TRUE == cartridgeUsedTestRun )
             {
                 doorClosedRequired( TRUE, TRUE );
+                resetArtVenPressureOffsets();
                 state = DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE;
             }
             else if ( occlusionBaselineWasSet != TRUE )