Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r19aba08f16ac2b5de18be8965767966e9698d03a -re9fe48dc279053be73c47668152377ae4dc30dd8
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 19aba08f16ac2b5de18be8965767966e9698d03a)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e9fe48dc279053be73c47668152377ae4dc30dd8)
@@ -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 -r19aba08f16ac2b5de18be8965767966e9698d03a -re9fe48dc279053be73c47668152377ae4dc30dd8
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 19aba08f16ac2b5de18be8965767966e9698d03a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision e9fe48dc279053be73c47668152377ae4dc30dd8)
@@ -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 );
         }
     }
 }