Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r62200ed6423dfd6ff7881bd0fc308162384e663e -rc08182ef9b9ae04e8d3a0aae96c015ce0f7a2fa5
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 62200ed6423dfd6ff7881bd0fc308162384e663e)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c08182ef9b9ae04e8d3a0aae96c015ce0f7a2fa5)
@@ -216,7 +216,7 @@
     F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
 
 #ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) );
+    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
 #else
     useHeparin = FALSE;
 #endif
@@ -342,14 +342,6 @@
  *************************************************************************/
 void transitionToDrySelfTests()
 {
-    F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-
-#ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) );
-#else
-    useHeparin = FALSE;
-#endif
     currentDrySelfTestsState = DRY_SELF_TESTS_START_STATE;
     pressureSelfTestBloodPumpRunStartTime = 0;
     pressureSelfTestNormalizedStartTime = 0;
@@ -674,7 +666,7 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( ( FALSE == isSyringePumpHome() ) && ( TRUE == isSyringePumpStopped() ) )
+        if ( TRUE == isSyringePumpStopped() )
         {
             retractSyringePump();
         }