Index: tests/test_flush.py
===================================================================
diff -u -r7d528c2109af39ed65e9dd3d61162de89ad22d96 -r1261e3824e07dc805e6bf3d73c5ee340bb88fc15
--- tests/test_flush.py	(.../test_flush.py)	(revision 7d528c2109af39ed65e9dd3d61162de89ad22d96)
+++ tests/test_flush.py	(.../test_flush.py)	(revision 1261e3824e07dc805e6bf3d73c5ee340bb88fc15)
@@ -10,13 +10,14 @@
 
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, '
             .format(dg.flush.flush_state, dg.flush.overall_elapsed_time, dg.flush.state_elapsed_time,
-                    dg.flush.flush_drain_line_volume))
+                    dg.flush.flush_drain_line_volume_l))
     return info
 
 
 def get_dg_valves_states():
 
     info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, '
+            'VRD1, {}, VRD2, {}, '
             .format(dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_INLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_SAMPLING_PORT],
                     dg.valves.valve_states_enum[dg.valves.VALVE_PRODUCTION_DRAIN],
@@ -27,7 +28,9 @@
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_OUTLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_INLET],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_FILL]))
+                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_FILL],
+                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_1],
+                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2]))
     return info
 
 
@@ -80,11 +83,11 @@
             # If the mode came back to standby or standby solo
             if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4:
                 # If it is the first call, stop heat disinfect
-                if complete_counter == 1:
-                    dg.hd_proxy.cmd_start_stop_dg_flush(start=False)
+                #if complete_counter == 1:
+                    #dg.hd_proxy.cmd_start_stop_dg_flush(start=False)
 
                 # Write a few more complete states to make sure the complete state items are recorded
-                elif complete_counter == 3:
+                if complete_counter == 3:
                     f.close()
                     break