Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -rf013ac5e5de456c4fa4367884cda6515f2a51642 -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -582,12 +582,12 @@
     TREATMENT_RESERVOIR_MGMT_STATE_T state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE;
 
     // Wait for the reservoir to settle and then send the commands to switch the active reservoir
-    if ( ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_SETTLE_TIME_MS ) ) /*&& ( volSpentML >= (F32)FILL_RESERVOIR_TO_VOLUME_ML )*/ )
+    if ( ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_SETTLE_TIME_MS ) ) && ( volSpentML >= (F32)FILL_RESERVOIR_TO_VOLUME_ML ) )
     {
         DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
 
         // TODO test code remove
-        if ( TRUE == test )
+        //if ( TRUE == test )
         {
             // Signal dialysis sub-mode to capture baseline volume for next reservoir.
             setStartReservoirVolume( inactiveRes );
@@ -608,11 +608,11 @@
 
         // TODO test code
         // For reservoir test, it should go back to start state
-        if ( FALSE == test )
+        /*if ( FALSE == test )
         {
             state = TREATMENT_RESERVOIR_MGMT_START_STATE;
         }
-        else
+        else*/
         {
             state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE;
             test = FALSE;