Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r68ee5d128b86860fac265d5ea25600bed9327077 -r25b00cb61a9c176a65006db0ea2dadc9742921f2
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 68ee5d128b86860fac265d5ea25600bed9327077)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 25b00cb61a9c176a65006db0ea2dadc9742921f2)
@@ -75,6 +75,7 @@
 
 /// Persist time (task intervals) for flow vs. motor speed error condition.
 static const U32 DIP_FLOW_VS_SPEED_PERSIST     = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
+//static const U32 DIP_FLOW_VS_SPEED_PERSIST     = ((60 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);   //DN-03NOV2022 - Make it 1 minutes for testing
 /// Persist time (task intervals) for motor off error condition.
 static const U32 DIP_OFF_ERROR_PERSIST         = ((5 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 /// Persist time (task intervals) motor speed error condition.
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r3f047e8eb2d165c8206123a2131e0bec7084aeb5 -r25b00cb61a9c176a65006db0ea2dadc9742921f2
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3f047e8eb2d165c8206123a2131e0bec7084aeb5)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 25b00cb61a9c176a65006db0ea2dadc9742921f2)
@@ -629,8 +629,7 @@
 
     signalBloodPumpHardStop();
     signalDialOutPumpHardStop();
-    //setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( 250, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); // TODO remove this line once the new flow control is implemented
+    setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     cmdStartDGTrimmerHeater();
 }
 
@@ -1178,6 +1177,7 @@
                     rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_1;
                     rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
                     reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
+
                     cmdSetDGActiveReservoir( &rsrvrCmd );
                 }
             }
@@ -1188,6 +1188,7 @@
                 rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_2;
                 rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
                 reservoirFlushedStatus[ DG_RESERVOIR_2 ] = TRUE;
+
                 cmdSetDGActiveReservoir( &rsrvrCmd );
             }
         }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r3f047e8eb2d165c8206123a2131e0bec7084aeb5 -r25b00cb61a9c176a65006db0ea2dadc9742921f2
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3f047e8eb2d165c8206123a2131e0bec7084aeb5)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 25b00cb61a9c176a65006db0ea2dadc9742921f2)
@@ -354,7 +354,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 );
         }
     }
 }
@@ -1312,8 +1312,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
                 {