Index: tests/dg_tests.py
===================================================================
diff -u -r4321c6a08162f15464cdae9419688eaad53aa890 -r626654c5a906ee4dd622907d5ac34b7b8fc0dfc8
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 4321c6a08162f15464cdae9419688eaad53aa890)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 626654c5a906ee4dd622907d5ac34b7b8fc0dfc8)
@@ -64,7 +64,7 @@
         state = DGChemicalDisinfectStates(dg.chemical_disinfect.chemical_disinfect_state).name
         overall_elapsed_time = dg.chemical_disinfect.overall_elapsed_time
         state_elapsed_time = dg.chemical_disinfect.state_elapsed_time
-        nelson_support = NelsonSupportModes(dg.heat_disinfect.heat_nelson_support).name
+        nelson_support = NelsonSupportModes(dg.chemical_disinfect.chem_nelson_support).name
     elif dg.dg_operation_mode == 11:
         state = DGChemDisinfectFlushStates(dg.chemical_disinfect_flush.flush_state).name
         overall_elapsed_time = dg.chemical_disinfect_flush.overall_elapsed_time
@@ -123,8 +123,8 @@
         nelson_support = NelsonSupportModes(dg.heat_disinfect.heat_nelson_support).name
 
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_RO_77, {}, Disinfect_RO_82, {}, '
-           'Disinfect_R_77, {}, Disinfect_R_82, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {}, '
-           'Nelson_support, {}, '
+            'Disinfect_R_77, {}, Disinfect_R_82, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Top_alarm, {}, UI_state, {},'
+            ' Nelson_support, {}, '
             .format(state, overall_elapsed_time, state_elapsed_time, dg.heat_disinfect.disinfect_ro_77_time_s,
                     dg.heat_disinfect.disinfect_ro_82_time_s, dg.heat_disinfect.disinfect_r_77_time_s,
                     dg.heat_disinfect.disinfect_r_82_time_s, dg.heat_disinfect.r1_level, dg.heat_disinfect.r2_level,
@@ -569,8 +569,8 @@
 def run_chemical_disinfect():
     complete_counter = 1
     f = open("/home/fw/projects/dialin/tests/chemical_disinfect.log", "w")
-    #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect()
-    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush()
+    dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect()
+    #dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect_flush()
 
     try:
         while True:
@@ -665,14 +665,15 @@
 
 def run_nelson_support_modes():
 
-    dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_HEAT_DISINFECT.value)
+    dg.heat_disinfect.cmd_set_nelson_support_mode(NelsonSupportModes.NELSON_CHEM_DISINFECT.value)
 
     f = open("/home/fw/projects/dialin/tests/Nelson_Support.log", "w")
 
     try:
         while True:
 
-            disinfect = get_heat_disinfect_mode_info()
+            #disinfect = get_heat_disinfect_mode_info()
+            disinfect = get_chemical_disinfect_mode_info()
             drain = get_drain_states_info()
             load_cell = get_load_cells_info()
             valves = get_dg_valves_states()
@@ -692,6 +693,7 @@
 
     except KeyboardInterrupt:
         dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False)
+        dg.hd_proxy.cmd_start_stop_dg_chemical_disinfect(start=False)
         f.close()