Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rc199cb4ae8b8ec123607b43c2f650964ef26ecf0 -rc1c47e288cbb5c5966a6ba919fec6fab15efa253
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c199cb4ae8b8ec123607b43c2f650964ef26ecf0)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c1c47e288cbb5c5966a6ba919fec6fab15efa253)
@@ -83,6 +83,7 @@
 #define SELF_TEST_TIME_DATA_PUB_INTERVAL                    ( MS_PER_SECOND )                       ///< Interval (ms/task time) at which self-test time data is published on the CAN bus.
 
 #define PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG        10.0F                                   ///< Prior to dry pressure leak test, arterial and venous pressure sensors should read zero +/- this tolerance.
+#define MAX_EMPTY_RESERVOIR_WEIGHT_G                        10.0F                                   ///< Maximum reservoir weight to be considered empty for cartridge pressure leak test.
 
 /// Multiplier to conver flow (mL/min) into volume (mL) for period of general task interval.
 static const F32 SELF_TEST_FLOW_INTEGRATOR = ( ( 1.0F * TASK_GENERAL_INTERVAL ) / ( SEC_PER_MIN * MS_PER_SECOND ) );
@@ -454,6 +455,13 @@
                 setValveAirTrap( STATE_OPEN );
                 currentDrySelfTestsState = DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE;
             }
+#ifndef _RELEASE_
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WORN_OUT_CARTRIDGE ) )
+            {
+                setValveAirTrap( STATE_CLOSED );
+                currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+            }
+#endif
             break;
 
         case DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE:
@@ -955,22 +963,28 @@
  *************************************************************************/
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsNormalSetupState( void )
 {
-    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE;
+    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE;
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         state = DRY_SELF_TESTS_STOPPED_STATE;
         setupForSelfTestsStop();
     }
     else
-    { // TODO - wait 1 sec before taking pressure readings and beginning pressure check
-        previousNormalArterialPressure = getFilteredArterialPressure();
-        previousNormalVenousPressure = getFilteredVenousPressure();
-
-        // Check to see if sensor is within normal ranges before we execute pressure sensor tests
-        if ( ( fabs( previousNormalArterialPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) || ( fabs( previousNormalVenousPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) )
+    {   // Wait for reservoir 2 to empty before starting pressure leak test
+        if ( ( DG_RESERVOIR_2 == getDGInactiveReservoir() ) && ( getLoadCellWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) < MAX_EMPTY_RESERVOIR_WEIGHT_G ) )
         {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
+            // TODO - wait 1 sec before taking pressure readings and beginning pressure check
+            previousNormalArterialPressure = getFilteredArterialPressure();
+            previousNormalVenousPressure = getFilteredVenousPressure();
+            cmdSetDGActiveReservoir( DG_RESERVOIR_2 );  // temporarily set reservoir 1 as active before cartridge pressure leak test starts.
+            state = DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE;
+
+            // Check to see if sensor is within normal ranges before we execute pressure sensor tests
+            if ( ( fabs( previousNormalArterialPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) || ( fabs( previousNormalVenousPressure ) > PRESSURE_CHECK_START_PRESSURE_TOLERANCE_MMHG ) )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, previousNormalArterialPressure, previousNormalVenousPressure );
+            }
         }
     }
 
@@ -1026,7 +1040,6 @@
     if ( VENOUS_PRESSURE_SELF_TEST_FIRST_PASS_LIMIT_MMHG <= venousPressure )
     {
         signalDialInPumpHardStop();
-        signalActionToResumeFill();
         state = DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE;
     }
 
@@ -1244,6 +1257,8 @@
     {
         if ( ( arterialPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) && ( venousPressureDiff <= NORMAL_PRESSURE_DIFF_TOLERANCE_MMHG ) )
         {
+            signalActionToResumeFill();
+            cmdSetDGActiveReservoir( DG_RESERVOIR_1 );  // restore reservoir 1 as active after cartridge pressure leak test completed.
             state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
         }
         else