Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r5013db4cabc632d52a308455396c6cd4017c885a -r15f9827c863812cfd1f891d22342103fe9a72abc
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 5013db4cabc632d52a308455396c6cd4017c885a)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
@@ -73,7 +73,7 @@
 
 static const F32 RESERVOIR_DILUTION_RATIO = MAX_RESERVOIR_DILUTION / ( 1.0 - MAX_RESERVOIR_DILUTION );   ///< Reservoir dilution ratio.
 
-// TOD remove
+// TODO remove
 // FALSE for reservoir 1 and TRUE for reservoir 2
 static BOOL test = TRUE;
 // TODO remove
@@ -597,8 +597,6 @@
 
             // Signal dialysis sub-mode to switch reservoirs
             signalReservoirsSwitched();
-
-            test = FALSE;
         }
         // TODO test code
 
@@ -609,9 +607,16 @@
         reservoirSwitchStartTimeMS = getMSTimerCount();
 
         // TODO test code
-        state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE;
         // For reservoir test, it should go back to start state
-        //state = TREATMENT_RESERVOIR_MGMT_START_STATE;
+        /*if ( FALSE == test )
+        {
+            state = TREATMENT_RESERVOIR_MGMT_START_STATE;
+        }
+        else*/
+        {
+            state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE;
+            test = FALSE;
+        }
         // TODO test code
     }