Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rba62e6bc4d1e85d99d40675ed00ede7cdfb9b6ba -rf0ccd5b6bd8df717a07f63efb7e4960663b52819
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ba62e6bc4d1e85d99d40675ed00ede7cdfb9b6ba)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f0ccd5b6bd8df717a07f63efb7e4960663b52819)
@@ -205,7 +205,16 @@
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
-    stopSyringePump();
+
+    if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
+    {
+        retractSyringePump();
+    }
+    else
+    {
+        stopSyringePump();
+    }
+
     setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VDO, VALVE_POSITION_A_INSERT_EJECT );
     setValvePosition( VBA, VALVE_POSITION_A_INSERT_EJECT );
@@ -997,12 +1006,8 @@
             }
             else
             {
-                if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
+                if ( TRUE == isSyringePumpHome() )
                 {
-                    retractSyringePump();
-                }
-                else if ( TRUE == isSyringePumpHome() )
-                {
                     seekSyringePlunger();
                 }
             }
@@ -1116,25 +1121,14 @@
 
         if ( FALSE == cmdResp.rejected )
         {
-            if ( ( TRUE == isValvesSettingSent ) && ( TRUE == getDGCommandResponse( DG_CMD_VALVE_SETTING, &cmdResp ) ) )
-            {
-                // Re-send command if DG rejects
-                isValvesSettingSent = FALSE;
+            F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
 
-                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;
 
-                    setDialInPumpTargetFlowRate( DIP_FLOW_RATE_SETUP_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-                    fmdIntegratedVolume = 0.0;
-
-                    if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
-                    {
-                        startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
-                    }
-
-                    state = WET_SELF_TESTS_SETUP_STATE;
-                }
+            if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
+            {
+                startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
             }
 
             state = WET_SELF_TESTS_SETUP_STATE;