Index: tests/test_nelson_labs_disinfect.py
===================================================================
diff -u -r85ed96413870850b1b008fe058aab5a0057a9e9b -r32e628abcbbd3fd70866505d9f2836a6f732ef06
--- tests/test_nelson_labs_disinfect.py	(.../test_nelson_labs_disinfect.py)	(revision 85ed96413870850b1b008fe058aab5a0057a9e9b)
+++ tests/test_nelson_labs_disinfect.py	(.../test_nelson_labs_disinfect.py)	(revision 32e628abcbbd3fd70866505d9f2836a6f732ef06)
@@ -1,14 +1,14 @@
 ###########################################################################
 #
-# Copyright (c) 2023-2023 Diality Inc. - All Rights Reserved.
+# Copyright (c) 2023-2024 Diality Inc. - All Rights Reserved.
 #
 # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
 # @file    test_nelson_labs_disinfect.py
 #
 # @author  (last)      Dara Navaei
-# @date    (last)      14-Feb-2023
+# @date    (last)      21-Jun-2023
 # @author  (original)  Dara Navaei
 # @date    (original)  03-Feb-2023
 #
@@ -63,13 +63,11 @@
 
     info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, Disinfect_elapsed_time, {}, '
             'Cancellation_mode, {}, R1_level, {:5.3f}, R2_level, {:5.3f}, Current_rinse_count, {}, '
-            'Total_rinse_count, {}, UI_state, {}, Top_alarm, {}, '
+            'Total_rinse_count, {}, Top_alarm, {}, '
             .format(state, overall_elapsed_time, state_elapsed_time,
-                    dg.chemical_disinfect.chemical_disinfect_elapsed_time,
+                    dg.chemical_disinfect.chemical_disinfect_target_time,
                     ChemCancellationModes(dg.chemical_disinfect.cancellation_mode).name, dg.chemical_disinfect.r1_level,
-                    dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0,
-                    DGChemDisinfectUIStates(dg.chemical_disinfect.chemical_disinfect_ui_state).name,
-                    hd.alarms.alarm_top))
+                    dg.chemical_disinfect.r2_level, dg.chemical_disinfect_flush.rinse_count, 0, hd.alarms.alarm_top))
     return info
 
 
@@ -247,13 +245,14 @@
             f.write(var)
             sleep(1)
 
-            if call_numer > 3:
-                # Wait for a couple of seconds and them exit this loop if we are no longer in any of the disinfec modes
-                if dg.dg_operation_mode is not DGOperationModes.DG_OP_MODE_DISINFECT.value and \
-                   dg.dg_operation_mode is not DGOperationModes.DG_OP_MODE_CHEMICAL_DISINFECT.value:
+            # Wait for a couple of seconds and then exit this loop if we are no longer in any of the disinfect modes
+            if dg.dg_operation_mode is not DGOperationModes.DG_OP_MODE_DISINFECT.value and \
+               dg.dg_operation_mode is not DGOperationModes.DG_OP_MODE_CHEMICAL_DISINFECT.value:
+                call_numer += 1
+
+                if call_numer > 3:
                     f.close()
                     exit()
-            call_numer += 1
 
     except KeyboardInterrupt:
         dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False)
@@ -319,8 +318,8 @@
 
     #run_nelson_drain_samples()
 
-    run_nelson_heat_positive_control()
+    #run_nelson_heat_positive_control()
 
-    run_nelson_heat_disinfect()
+    #run_nelson_heat_disinfect()
 
-    #run_nelson_chem_disinfect()
\ No newline at end of file
+    run_nelson_chem_disinfect()
\ No newline at end of file