Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r9fa9249e89e8819e6ea03c51cfe34498095cb4b8 -r387a763cd2ca85cc5245f8e8953485299047f096
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9fa9249e89e8819e6ea03c51cfe34498095cb4b8)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 387a763cd2ca85cc5245f8e8953485299047f096)
@@ -1164,12 +1164,12 @@
         state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
 
         if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].flushComplete ) &&
-                ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].flushComplete ) )
+             ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].flushComplete ) )
         {
             reservoirStatus[ inactiveReservoir ].fillComplete = TRUE;
 
             if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].fillComplete ) &&
-                    ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].fillComplete ) )
+                 ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].fillComplete ) )
             {
                 state = PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE;
             }
@@ -1185,7 +1185,7 @@
                 {
                     reservoirStatus[ inactiveReservoir ].flushCount -= 1;
                 }
-                if ( 0 == reservoirStatus[ inactiveReservoir ].flushCount )
+                else // 0 == reservoirStatus[ inactiveReservoir ].flushCount
                 {
                     reservoirStatus[ inactiveReservoir ].flushComplete = TRUE;
                 }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r023566f1e1c9a4829eca62d6c0ef1c1da2f12292 -r387a763cd2ca85cc5245f8e8953485299047f096
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 023566f1e1c9a4829eca62d6c0ef1c1da2f12292)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 387a763cd2ca85cc5245f8e8953485299047f096)
@@ -73,6 +73,7 @@
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0F                                  ///< Target of second displacement volume in ml.
 #define WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE       0.05F                                   ///< Tolerance on integrated volume as a percentage (5%).
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           20.0F                                   ///< Tolerance on integrated volume in grams.
+#define WET_SELF_TEST_INTEGRATED_VOLUME_WIDER_TOLERANCE     100.0F                                  ///< Wider tolerance on integrated volume in grams, during debug.
 #define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              20.0F                                   ///< Tolerance in the load cell readings of the displacement in grams.
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS            ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms (first).
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS           ( 30 * MS_PER_SECOND )                  ///< Time to displace dialysate in wet self-test in ms (second).
@@ -1742,7 +1743,7 @@
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_WET_SELF_TEST_WIDER_VOLUME_TOL ) )
     {
-        integrateVolumeToleranceG = 100.0F;
+        integrateVolumeToleranceG = WET_SELF_TEST_INTEGRATED_VOLUME_WIDER_TOLERANCE;
     }
 #endif