Index: tests/dg_heat_and_chemical_disinfect_test.py
===================================================================
diff -u -r597b213629a8243dd0d76ee5fe16f7b83e64483f -rf0c77deb1d6f38f6bedb5ced326cdc85715fe15f
--- tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision 597b213629a8243dd0d76ee5fe16f7b83e64483f)
+++ tests/dg_heat_and_chemical_disinfect_test.py	(.../dg_heat_and_chemical_disinfect_test.py)	(revision f0c77deb1d6f38f6bedb5ced326cdc85715fe15f)
@@ -9,6 +9,7 @@
 from dialin.dg.thermistors import ThermistorsNames
 from dialin.dg.temperature_sensors import TemperatureSensorsNames
 from dialin.dg.dialysate_generator import DGOperationModes
+from dialin.dg.valves import *
 from time import sleep
 
 
@@ -149,7 +150,9 @@
     counter = 1
     f = open("/home/fw/projects/dialin/tests/run_dg.log", "w")
     dg.hd_proxy.cmd_start_stop_dg()
-    sleep(0.2)
+    sleep(0.1)
+    dg.hd_proxy.cmd_switch_reservoirs(reservoirID=0)
+    sleep(0.1)
 
     try:
         while True:
@@ -160,34 +163,42 @@
             ro = get_ro_info()
             valves = get_dg_valves_states()
 
-            var = dg_run + load_cell + drain + ro + valves + '\r'
+            var = str(counter) + ', ' + dg_run + load_cell + drain + ro + valves + '\r'
 
             print(var)
             f.write(var)
 
             if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\
-                    dg.dg_operation_sub_mode == 2 and counter == 1:
-                dg.hd_proxy.cmd_switch_reservoirs(reservoirID=1)
-                sleep(3)
-                dg.hd_proxy.cmd_drain(tare_load_cell=True)
+                    dg.dg_operation_sub_mode == 2:
+
+                if counter == 1:
+                    dg.valves.cmd_valve_override(VDrVRcStates.VALVE_STATE_RECIRC_C_TO_NC.value, dg.valves.VALVE_DRAIN)
+
+                if counter == 5:
+                    dg.valves.cmd_valve_override(VDrVRcStates.VALVE_STATE_DRAIN_C_TO_NO.value, dg.valves.VALVE_DRAIN)
+                    dg.valves.cmd_valve_override(VPiVSPVBfVRD1VRD2States.VALVE_STATE_OPEN.value,
+                                                 dg.valves.VALVE_RESERVOIR_DRAIN_1)
+
+                if counter == 6:
+
+                    dg.drain_pump.cmd_drain_pump_speed_set_point_override(2100)
+
                 counter += 1
-                sleep(0.15)
 
+            """"
             if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\
                     dg.dg_operation_sub_mode == 2 and counter == 2:
-                dg.hd_proxy.cmd_fill(volume=1200)
+                dg.hd_proxy.cmd_fill(volume=1700)
                 counter += 1
                 sleep(0.15)
 
             if DGOperationModes(dg.dg_operation_mode).name == DGOperationModes.DG_OP_MODE_RECIRCULATE.name and\
                     dg.dg_operation_sub_mode == 2 and counter == 3:
                 #dg.hd_proxy.cmd_switch_reservoirs(reservoirID=0)
-                dg.ro_pump.cmd_ro_pump_duty_cycle_pct(0)
-                sleep(3)
-                dg.hd_proxy.cmd_drain()
+                dg.hd_proxy.cmd_drain(volume=50)
                 counter += 1
                 sleep(0.15)
-
+            """
             sleep(1)
 
     except KeyboardInterrupt: