Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -rf6b78d1fe6741043de38707211710ab0e8a08483 -r23016be42e59935da5aa53b26b8cb31e2a240858
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 23016be42e59935da5aa53b26b8cb31e2a240858)
@@ -78,8 +78,8 @@
 #define ARTERIAL_PRESSURE_STALE_DATA        2                                               ///< Arterial pressure status bits indicate data is stale (no new data since last fpga read).
 #define ARTERIAL_PRESSURE_DIAG_CONDITION    3                                               ///< Arterial pressure status bits diagnostic condition (alarm).
 
-#define OCCLUSION_THRESHOLD_OFFSET          10000                                           ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived above which an occlusion is detected.
-#define OCCLUSION_CLEAR_THRESHOLD_OFFSET    6000                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived below which an occlusion is cleared.
+#define OCCLUSION_THRESHOLD_OFFSET          4000                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived above which an occlusion is detected.
+#define OCCLUSION_CLEAR_THRESHOLD_OFFSET    4000                                            ///< Threshold offset.  Combined with initial reading after cartridge install, a threshold is derived below which an occlusion is cleared.
 
 #define CARTRIDGE_LOADED_THRESHOLD          5000                                            ///< Threshold above which a cartridge is considered loaded.
 #define MIN_OCCLUSION_COUNTS                2000                                            ///< Minimum occlusion sensor reading for range check.
Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rf6b78d1fe6741043de38707211710ab0e8a08483 -r23016be42e59935da5aa53b26b8cb31e2a240858
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 23016be42e59935da5aa53b26b8cb31e2a240858)
@@ -105,21 +105,21 @@
             break;
 
         case CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_BICARB_PUMP_CHECK ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE;
             }
             break;
 
         case CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_ACID_PUMP_CHECK ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE;
             }
             break;
 
         case CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_PRODUCE_DIALYSATE ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
                 cmdStopDGFill();
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf6b78d1fe6741043de38707211710ab0e8a08483 -r23016be42e59935da5aa53b26b8cb31e2a240858
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f6b78d1fe6741043de38707211710ab0e8a08483)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 23016be42e59935da5aa53b26b8cb31e2a240858)
@@ -1004,7 +1004,8 @@
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
-                    state = DRY_SELF_TESTS_COMPLETE_STATE;
+                    state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
+                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 3 seconds has elapsed
                 }
                 else
                 {
@@ -1013,12 +1014,8 @@
             }
             else
             {
-                if ( TRUE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM ) )
+                if ( TRUE == isSyringePumpHome() )
                 {
-                    retractSyringePump();
-                }
-                else if ( TRUE == isSyringePumpHome() )
-                {
                     seekSyringePlunger();
                 }
             }