Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r4efd42acbcbde896a1e9e532db77a72bebea0bdc -rbc538f960d0bc8c72991817ea52efac4775ce953
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4efd42acbcbde896a1e9e532db77a72bebea0bdc)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision bc538f960d0bc8c72991817ea52efac4775ce953)
@@ -41,6 +41,7 @@
 
 #define PUMP_RUN_SELF_TEST_TIME_MS                          ( 15 * MS_PER_SECOND )                  ///< Self-test time to run pumps in ms.
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
+#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 1 second then check for syringe pump prime occlusion.
 
 #define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 5 * MS_PER_SECOND )                   ///< Pressure self-test time to run blood pump in ms.
 #define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
@@ -112,6 +113,7 @@
 
 static U32 selfTestStartTime;                                       ///< Starting time of self-test (in ms).
 static U32 selfTestPreviousPublishDataTime;                         ///< Last time self-test time data is being published (in ms).
+static U32 syringeOcclusionDelayStartTime;                          ///< Used to calculate the 1 second delay time before check for prime occlusion.
 
 static BOOL useHeparin;                                             ///< Flag indicates the user of heparin.
 
@@ -135,6 +137,7 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsState( SELF_TEST_STATUS_T *result );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestPressureSensorsNormalState( SELF_TEST_STATUS_T *result );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestSyringePumpPrimeState( void );
+static DRY_SELF_TESTS_STATE_T handleDrySelfTestSyringePumpOcclusionDetectionState( void );
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestStoppedState( void );
 
 static WET_SELF_TESTS_STATE_T handleWetSelfTestStartState( void );
@@ -422,6 +425,10 @@
             currentDrySelfTestsState = handleDrySelfTestSyringePumpPrimeState();
             break;
 
+        case DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE:
+            currentDrySelfTestsState = handleDrySelfTestSyringePumpOcclusionDetectionState();
+            break;
+
         case DRY_SELF_TESTS_STOPPED_STATE:
             currentDrySelfTestsState = handleDrySelfTestStoppedState();
             break;
@@ -486,7 +493,6 @@
  *************************************************************************/
 void transitionToWetSelfTests()
 {
-    F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
     signalDialInPumpHardStop();   // turn off DPi that was on in previous dialysate bypass state
     wetSelfTestsResult = FALSE;
     currentWetSelfTestsState = WET_SELF_TESTS_START_STATE;
@@ -497,11 +503,6 @@
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
-    if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
-    {
-        startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
-    }
-
     resetSelfTestsFlags();
 }
 
@@ -985,7 +986,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 1 second has elapsed
                 }
                 else
                 {
@@ -1021,6 +1023,28 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleDrySelfTestSyringePumpPrimeState function handles the prime
+ * operation for syringe pump.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return the next state of dry self-tests state machine
+ *************************************************************************/
+static DRY_SELF_TESTS_STATE_T handleDrySelfTestSyringePumpOcclusionDetectionState( void )
+{
+    DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
+    BOOL stopPump = FALSE;
+
+    if ( TRUE == didTimeout( syringeOcclusionDelayStartTime, SYRINGE_PUMP_OCCLUSION_CHECK_DELAY ) )
+    {
+        stopPump = checkForPrimeOcclusion( stopPump );
+        state = DRY_SELF_TESTS_COMPLETE_STATE;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDrySelfTestStoppedState function handles the stopped dry self-tests
  * operation.
  * @details Inputs: none
@@ -1086,8 +1110,16 @@
 
         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;
+
+            if ( ( bolusVol > 0.0 ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
+            {
+                startHeparinBolus();            // moved here from startHeparinPump() in Dialysis.c
+            }
+
             state = WET_SELF_TESTS_SETUP_STATE;
         }
     }