Index: dialin/common/msg_ids.py
===================================================================
diff -u -r6e92c24e6e1bc8b22bfbe188085578ad3f3359d9 -r21a53e63bedeb01f5eb2a85130e6b6fc454f2f88
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 6e92c24e6e1bc8b22bfbe188085578ad3f3359d9)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 21a53e63bedeb01f5eb2a85130e6b6fc454f2f88)
@@ -169,8 +169,6 @@
     MSG_ID_HD_SERIAL_NUMBER = 0x99,
     MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST = 0x9A
     MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE = 0x9B
-    MSG_ID_HD_DISINFECTS_UI_STATE_READINGS_FROM_DG = 0x9C
-    MSG_ID_HD_DISINFECTS_UI_STATES_DATA = 0x9D
     MSG_ID_DIALYSATE_FLOW_DATA = 0X8
     MSG_ID_TESTER_LOGIN_REQUEST = 0X8000
     MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001
Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -rde18ddfc1d74a39cd434af5c9a32962050aaef5f -r21a53e63bedeb01f5eb2a85130e6b6fc454f2f88
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision de18ddfc1d74a39cd434af5c9a32962050aaef5f)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 21a53e63bedeb01f5eb2a85130e6b6fc454f2f88)
@@ -195,7 +195,7 @@
                                                         self._handler_treatment_end_cmd_response)
             self.can_interface.\
                 register_receiving_publication_function(DenaliChannels.hd_sync_broadcast_ch_id,
-                                                        MsgIds.MSG_ID_HD_DISINFECTS_UI_STATES_DATA.value,
+                                                        MsgIds.MSG_ID_HD_STANDBY_STATE.value,
                                                         self._handler_disinfects_data_publish)
 
         # initialize variables that will be populated by HD version response
Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -rde18ddfc1d74a39cd434af5c9a32962050aaef5f -r21a53e63bedeb01f5eb2a85130e6b6fc454f2f88
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision de18ddfc1d74a39cd434af5c9a32962050aaef5f)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 21a53e63bedeb01f5eb2a85130e6b6fc454f2f88)
@@ -335,11 +335,11 @@
     dg.cmd_log_in_to_dg()
     sleep(1)
 
-    #run_heat_disinfect()
+    run_heat_disinfect()
 
     #run_chemical_disinfect()
 
-    run_dg()
+    #run_dg()
 
     #cmd_set_disinfect_ui_screen()
 
Index: tests/test_flush.py
===================================================================
diff -u -r7fa5f37e738a58e4e6a784bcd3e638c06a6d0b9e -r21a53e63bedeb01f5eb2a85130e6b6fc454f2f88
--- tests/test_flush.py	(.../test_flush.py)	(revision 7fa5f37e738a58e4e6a784bcd3e638c06a6d0b9e)
+++ tests/test_flush.py	(.../test_flush.py)	(revision 21a53e63bedeb01f5eb2a85130e6b6fc454f2f88)
@@ -13,7 +13,16 @@
                     dg.flush.flush_drain_line_volume_l))
     return info
 
+def get_concentrate_pumps_info():
 
+    info = ('Bicarb_tgt_speed, {:5.3f}, Bicarb_speed, {:5.3f}, CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, '
+            .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed,
+                    dg.concentrate_pumps.concentrate_pump_cp2_measured_speed,
+                    dg.conductivity_sensors.conductivity_sensor_cpo, dg.conductivity_sensors.conductivity_sensor_cd1,
+                    dg.conductivity_sensors.conductivity_sensor_cd2))
+    return info
+
+
 def get_dg_valves_states():
 
     info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, '
@@ -64,27 +73,25 @@
 def run_flush_mode():
 
     complete_counter = 1
-    f = open("/home/fw/projects/dialin/tests/Flush_mode.log", "w")
+    f = open("/home/fw/projects/dialin/tests/flush_mode.log", "w")
     dg.hd_proxy.cmd_start_stop_dg_flush()
     try:
         while True:
             flush = get_flush_mode_info()
             load_cell = get_load_cells_info()
             drain = get_drain_states_info()
             ro = get_ro_info()
+            conc = get_concentrate_pumps_info()
             valves = get_dg_valves_states()
 
-            var = flush + load_cell + drain + ro + valves + '\r'
+            var = flush + load_cell + drain + ro + conc + valves + '\r'
 
             print(var)
             f.write(var)
             sleep(1)
 
             # 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)
 
                 # Write a few more complete states to make sure the complete state items are recorded
                 if complete_counter == 3: