Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r83a8a0e1e8630939e6a173f1313cceb7f39e00dd -ra8918c5013f6fe379f4fc4b6fee5045cbfc93d38
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 83a8a0e1e8630939e6a173f1313cceb7f39e00dd)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a8918c5013f6fe379f4fc4b6fee5045cbfc93d38)
@@ -41,7 +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                  ( 3 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
+#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 3 seconds 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.
@@ -323,7 +323,7 @@
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -906,10 +906,10 @@
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
+//    else
+//    {
+//        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+//    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
@@ -1054,8 +1054,8 @@
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
+                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 1 second has elapsed
                     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
                 {
@@ -1134,6 +1134,7 @@
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
+
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
         {
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rf7ef5e8d8f0ecf1f69de82ce86faa302012d825f -ra8918c5013f6fe379f4fc4b6fee5045cbfc93d38
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision f7ef5e8d8f0ecf1f69de82ce86faa302012d825f)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision a8918c5013f6fe379f4fc4b6fee5045cbfc93d38)
@@ -516,7 +516,7 @@
 
         // If the wait time has elapsed, trigger a fill command
         // TODO uncomment
-        //if ( timeWaitToFillMS <= 0 )
+        if ( timeWaitToFillMS <= 0 )
         // TODO uncomment
         {
             cmdStartDGFill( FILL_RESERVOIR_TO_VOLUME_ML, targetFillFlowRateLPM );