Index: tests/dg_tests.py
===================================================================
diff -u -rc179a1b072005028cb495911f463b2bfcd9aa1d2 -ra95fe2ff6a5462887410c5f1ffa99c7cf75e0411
--- tests/dg_tests.py	(.../dg_tests.py)	(revision c179a1b072005028cb495911f463b2bfcd9aa1d2)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision a95fe2ff6a5462887410c5f1ffa99c7cf75e0411)
@@ -69,9 +69,13 @@
     return info
 
 def get_chemical_disinfect_flush_mode_info():
-    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Drain_vol, {:5.3f}, Top_alarm, {}, '
-            .format(DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name, dg.chemical_disinfect_flush.overall_elapsed_time, dg.chemical_disinfect_flush.state_elapsed_time,
-                    dg.chemical_disinfect_flush.flush_drain_line_volume_l, hd.alarms.alarm_top))
+    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, r1, {:5.1f}, r2, {:5.1f}, '
+             'Target_rinse_count, {}, Rinse_count, {}, Top_alarm, {}, UI_state, {},'
+            .format(DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name,
+                    dg.chemical_disinfect_flush.overall_elapsed_time, dg.chemical_disinfect_flush.state_elapsed_time,
+                    dg.chemical_disinfect_flush.r1, dg.chemical_disinfect_flush.r2,
+                    dg.chemical_disinfect_flush.target_rinse_count, dg.chemical_disinfect_flush.rinse_count,
+                    hd.alarms.alarm_top, dg.chemical_disinfect_flush.flush_UI_state))
     return info
 
 def get_heat_disinfect_mode_info():
@@ -81,7 +85,7 @@
                     dg.heat_disinfect.overall_elapsed_time, dg.heat_disinfect.state_elapsed_time,
                     dg.heat_disinfect.heat_disinfect_count_down_time, dg.heat_disinfect.r1_level,
                     dg.heat_disinfect.r2_level, hd.alarms.alarm_top,
-                    DGHeatDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name))
+                    DGHeatDisinfectUIStates(dg.heat_disinfect.heat_disinfect_ui_state).name))
     return info
 
 
@@ -608,8 +612,6 @@
             # If the mode came back to standby or standby solo
             if dg.dg_operation_mode == 3 or dg.dg_operation_mode == 4:
 
-                if complete_counter == 1:
-                    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush()
                 # Write a few more complete states to make sure the complete state items are recorded
                 if complete_counter == 3:
                     f.close()