Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r74677e70207375e47918c62cd0509eb30f2cf2df -re9fe48dc279053be73c47668152377ae4dc30dd8
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 74677e70207375e47918c62cd0509eb30f2cf2df)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e9fe48dc279053be73c47668152377ae4dc30dd8)
@@ -1432,35 +1432,36 @@
     F32 const resOneWeight = getReservoirWeightLargeFilter( DG_RESERVOIR_1 );
     setupDisplacementVolume = fabs( resOneWeight - WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML );
 
-    if ( FALSE == isValvesSettingSent )
+    //if ( FALSE == isValvesSettingSent )
     {
         isValvesSettingSent = TRUE;
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
         setValvePosition( VDO, VALVE_POSITION_C_CLOSE );
 
-        if ( resOneWeight > WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML )
+        // TODO remove
+        /*if ( resOneWeight > WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML )
         {
             cmdChangeDGValveSetting( DG_VALVE_SETTING_R1_TO_R2 );
         }
         else
         {
             cmdChangeDGValveSetting( DG_VALVE_SETTING_R2_TO_R1 );
-        }
+        }*/
     }
 
-    if ( ( TRUE == isValvesSettingSent ) && ( TRUE == getDGCommandResponse( DG_CMD_VALVE_SETTING, &cmdResp ) ) )
+    //if ( ( TRUE == isValvesSettingSent ) && ( TRUE == getDGCommandResponse( DG_CMD_VALVE_SETTING, &cmdResp ) ) )
     {
         // Re-send command if DG rejects
-        isValvesSettingSent = FALSE;
+        //isValvesSettingSent = FALSE;
 
-        if ( FALSE == cmdResp.rejected )
+        //if ( FALSE == cmdResp.rejected )
         {
             F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
 
             setDialInPumpTargetFlowRate( DIP_FLOW_RATE_SETUP_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-            fmdIntegratedVolume = 0.0;
+            fmdIntegratedVolume = 0.0F;
 
-            if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
+            if ( ( bolusVol > 0.0F ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
             {
                 startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
             }
@@ -1595,8 +1596,9 @@
 
     if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() )
     {
-        settleStartTime = getMSTimerCount();
-        state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
+        settleStartTime     = getMSTimerCount();
+        isValvesSettingSent = FALSE;
+        state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )