Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf699178c91a882b71e96ebab9d24bb21005a4526 -rf0c52f6adff7b61132953890a74f1c462b31eedf
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f699178c91a882b71e96ebab9d24bb21005a4526)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f0c52f6adff7b61132953890a74f1c462b31eedf)
@@ -212,10 +212,10 @@
 void transitionToNoCartSelfTests( void )
 {
     F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+    F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
 #ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) );
+    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
 #else
     useHeparin = FALSE;
 #endif
@@ -333,14 +333,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;
@@ -634,7 +626,7 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( ( FALSE == isSyringePumpHome() ) && ( TRUE == isSyringePumpStopped() ) )
+        if ( TRUE == isSyringePumpStopped() )
         {
             retractSyringePump();
         }
@@ -794,10 +786,6 @@
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {