Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rcf0f5e54c1a7af4d8a739cbd677d899d95e4019b -r39c791d03f363ce2c684597080fc8c2f5515976f
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision cf0f5e54c1a7af4d8a739cbd677d899d95e4019b)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 39c791d03f363ce2c684597080fc8c2f5515976f)
@@ -973,9 +973,9 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( TRUE == isSyringePlungerFound() )
+        if ( FALSE == isSyringePumpRunning() )
         {
-            if ( TRUE == isSyringeVolumeAdequate() )
+            if ( TRUE == isSyringePlungerFound() )
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
@@ -988,13 +988,16 @@
             }
             else
             {
-                retractSyringePump();
+                if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
+                {
+                    retractSyringePump();
+                }
+                else if ( TRUE == isSyringePumpHome() )
+                {
+                    seekSyringePlunger();
+                }
             }
         }
-        else
-        {
-            seekSyringePlunger();
-        }
     }
     else
     {