Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r8fdc824a86ce29f67c06993ea6d4b0555f7981d9 -r08112aa94706fcdda08c5d77e3533768fefbda69
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8fdc824a86ce29f67c06993ea6d4b0555f7981d9)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 08112aa94706fcdda08c5d77e3533768fefbda69)
@@ -69,7 +69,6 @@
 #define DIP_FLOW_RATE_FIRST_DISPLACEMENT_ML_MIN             100                                     ///< Dialysate inlet pump flow rate during the first displacement in wet self-test.
 #define DIP_FLOW_RATE_SECOND_DISPLACEMENT_ML_MIN            600                                     ///< Dialysate inlet pump flow rate during the second displacement in wet self-test.
 
-#define WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML         1200.0F                                 ///< Setup volume for reservoir one before wet self-test in ml.
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML   100.0F                                  ///< Target of first displacement volume in ml.
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0F                                  ///< Target of second displacement volume in ml.
 #define WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE       0.05F                                   ///< Tolerance on integrated volume as a percentage (5%).
@@ -87,9 +86,6 @@
 #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                        15.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 ) );
-
 // ********** private data **********
 
 static NO_CART_SELF_TESTS_STATE_T currentNoCartSelfTestsState;      ///< Current state of the no cartridge self-tests state machine.
@@ -115,7 +111,6 @@
 static U32 displacementStartTime;                                   ///< Dialysate displacement starting time.
 static F32 fmdIntegratedVolume;                                     ///< FMD integrated volume over displacement time.
 static F32 reservoirVolume[ NUM_OF_DG_RESERVOIRS ];                 ///< Hold the current volume of all reservoirs.
-static F32 setupDisplacementVolume;                                 ///< Hold the setup displacement volume to get reservoir one to target volume.
 static BOOL isValvesSettingSent;                                    ///< Flag indicates valve setting change has been send to DG.
 
 static U32 selfTestStartTime;                                       ///< Starting time of self-test (in ms).
@@ -1479,24 +1474,20 @@
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestStartState( void )
 {
-    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_START_STATE;
+    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_SETUP_STATE;
     F32 resOneWeight             = getReservoirWeightLargeFilter( DG_RESERVOIR_1 );
-    setupDisplacementVolume      = fabs( resOneWeight - WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML );
     F32 bolusVol                 = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
 
     isValvesSettingSent = TRUE;
     setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
     setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
-    setDialInPumpTargetFlowRate( DIP_FLOW_RATE_SETUP_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     fmdIntegratedVolume = 0.0F;
 
     if ( ( bolusVol > 0.0F ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
     {
         startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
     }
 
-    state = WET_SELF_TESTS_SETUP_STATE;
-
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         state = WET_SELF_TESTS_STOPPED_STATE;
@@ -1516,17 +1507,10 @@
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestSetupState( void )
 {
-    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_SETUP_STATE;
+    WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLES_STATE;
 
-    setupDisplacementVolume -= ( SELF_TEST_FLOW_INTEGRATOR * getMeasuredDialInFlowRate() );
+    selfTestBubble( ADV );
 
-    if ( setupDisplacementVolume <= 0.0 )
-    {
-        signalDialInPumpHardStop();
-        selfTestBubble( ADV );
-        state = WET_SELF_TESTS_BUBBLES_STATE;
-    }
-
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
         state = WET_SELF_TESTS_STOPPED_STATE;