Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -rd2f5856e101a17d9bbb3098f3137ac7e0da918ef -r5fe41dabe19ca9d1da4385a0c72fdc55a8107870
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision d2f5856e101a17d9bbb3098f3137ac7e0da918ef)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 5fe41dabe19ca9d1da4385a0c72fdc55a8107870)
@@ -23,7 +23,7 @@
 from dialin.dg.chemical_disinfect import ChemCancellationModes
 from dialin.dg.drain_pump import DrainPumpStates
 from dialin.dg.thermistors import ThermistorsNames
-from dialin.dg.temperature_sensors import TemperatureSensorsNames
+from dialin.dg.temperature_sensors import DGTemperaturesNames
 from dialin.dg.dialysate_generator import DGOperationModes
 from dialin.hd.temperatures import HDTemperaturesNames
 from dialin.common.hd_defs import HDOpModes, HDOpSubModes
@@ -73,8 +73,10 @@
 
 
 def get_hd_run_info():
-    info = ('HD_op_mode, {}, HD_sub_mode, {}, Top_alarm, {}, '
-            .format(HDOpModes(hd.hd_operation_mode).name, hd.hd_operation_sub_mode, hd.alarms.alarm_top))
+    info = ('HD_op_mode, {}, HD_sub_mode, {}, Top_alarm, {}, Target_UF_ml, {:5.3f}, Meas_UF_ml, {:5.3f}, '
+            .format(HDOpModes(hd.hd_operation_mode).name, hd.hd_operation_sub_mode, hd.alarms.alarm_top,
+                    hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume,
+                    hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume))
     return info
 
 
@@ -96,8 +98,9 @@
     #                                                                 dg.events.get_dg_events(DGEventList(1).value, 3),
     #                                                                 dg.events.get_dg_events(DGEventList(2).value, 3)))
 
-    info = ('DG_op_mode, {}, DG_sub_mode, {}, '.format(DGOperationModes(dg.dg_operation_mode).name,
-                                                       dg.dg_operation_sub_mode))
+    info = ('DG_op_mode, {}, DG_op_mode_num, {}, DG_sub_mode, {}, '.format(DGOperationModes(dg.dg_operation_mode).name,
+                                                                           dg.dg_operation_mode,
+                                                                           dg.dg_operation_sub_mode))
     return info
 
 
@@ -165,12 +168,12 @@
 
 def get_temperature_sensors_info():
     info = ('TPi, {:5.3f}, TPo, {:5.3f}, TD1, {:5.3f}, TD2, {:5.3f}, TRo, {:5.3f}, TDi, {:5.3f}, '
-            .format(dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_PRIMARY_HEATER.name],
-                    dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_PRIMARY_HEATER.name],
-                    dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.CONDUCTIVITY_SENSOR_1.name],
-                    dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.CONDUCTIVITY_SENSOR_2.name],
-                    dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.OUTLET_DIALYSATE_REDUNDANT.name],
-                    dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.INLET_DIALYSATE.name]))
+            .format(dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.INLET_PRIMARY_HEATER.name],
+                    dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name],
+                    dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name],
+                    dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name],
+                    dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name],
+                    dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.INLET_DIALYSATE.name]))
     return info
 
 
@@ -184,9 +187,9 @@
                     dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_ONBOARD_NTC.name],
                     dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_POWER_SUPPLY_1.name],
                     dg.thermistors.thermistors[ThermistorsNames.THERMISTOR_POWER_SUPPLY_2.name],
-                    dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.FPGA_BOARD_SENSOR.name],
-                    dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.LOAD_CELL_A1_B1.name],
-                    dg.temperature_sensors.temperature_sensors[TemperatureSensorsNames.LOAD_CELL_A2_B2.name]))
+                    dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.FPGA_BOARD_SENSOR.name],
+                    dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.LOAD_CELL_A1_B1.name],
+                    dg.temperature_sensors.temperature_sensors[DGTemperaturesNames.LOAD_CELL_A2_B2.name]))
     return info