Index: tests/dg_tests.py
===================================================================
diff -u -rf822b55ab067aba716dc07f7fa3f53ef9cb2c9e3 -r31c0b4a36d8bafbb69e217803546291b1af30f02
--- tests/dg_tests.py	(.../dg_tests.py)	(revision f822b55ab067aba716dc07f7fa3f53ef9cb2c9e3)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 31c0b4a36d8bafbb69e217803546291b1af30f02)
@@ -361,11 +361,13 @@
 
 def collect_treatment_data():
     f = open("/home/fw/projects/dialin/tests/treatment_run.log", "w")
+
+    #dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CPI.value, 1500.00)
+    #sleep(1)
+
     """
-    dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD2.value, 6900.00)
-    sleep(1)
     dg.conductivity_sensors.cmd_conductivity_sensor_override(ConductivitySensorsEnum.CD1.value, 12100.00)
-    sleep(1)
+    sleep(1)SW_CONFIG_DISABLE_WATER_QUALITY_CHECK
 
     dg.dialysate_fill.cmd_used_bicarb_volume_override(3700.0)
     sleep(1)
@@ -443,7 +445,7 @@
 def run_heat_disinfect():
     complete_counter = 1
     f = open("/home/fw/projects/dialin/tests/Heat_disinfect.log", "w")
-    dg.hd_proxy.cmd_start_stop_heat_disinfect()
+    dg.hd_proxy.cmd_start_stop_dg_heat_disinfect()
 
     try:
         while True:
@@ -469,7 +471,7 @@
             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_heat_disinfect(start=False)
+                    dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False)
 
                 # Write a few more complete states to make sure the complete state items are recorded
                 elif complete_counter == 3:
@@ -480,7 +482,7 @@
                 complete_counter += 1
 
     except KeyboardInterrupt:
-        dg.hd_proxy.cmd_start_stop_heat_disinfect(start=False)
+        dg.hd_proxy.cmd_start_stop_dg_heat_disinfect(start=False)
         f.close()
 
 
@@ -534,48 +536,6 @@
         sleep(1)
 
 
-def test_hd_fans_alarms():
-    f = open("/home/fw/projects/dialin/tests/fans_issues.log", "w")
-    counter = 0
-    while counter < 10:
-
-        hd.cmd_hd_software_reset_request()
-        sleep(1)
-        hd.alarms.clear_dialin_alarms()
-
-        while True:
-            if hd.hd_operation_mode == HDOpModes.MODE_STAN.value:
-                hd.cmd_log_in_to_hd()
-                sleep(1)
-                hd.fans.cmd_fans_data_broadcast_interval_override(50, reset=0)
-                sleep(1)
-                hd.fans.cmd_fans_rpm_override(0, 1000.0, reset=0)
-                start_time = datetime.now()
-                i = 0
-                ack = False
-                counter = 0
-                while True:
-                    alarm_state = hd.alarms.get_alarm_state(AlarmList.ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE.value)
-                    info = str(alarm_state) + ', ' + str(datetime.now() - start_time) + ', ' + get_hd_fans_info() + '\r'
-                    print(info)
-                    f.write(info)
-
-                    if alarm_state:
-                        if ack is False and counter == 0:
-                            hd.ui.cmd_ui_user_alarm_response(3)
-                            ack = True
-                    if ack:
-                        if i == 0 and counter == 50:
-                            hd.fans.cmd_fans_rpm_alarm_start_time_offset(86300)
-                            i += 1
-                        elif alarm_state and i > 0:
-                            break
-                        counter += 1
-
-                    sleep(0.05)
-                break
-
-
 def test_dg_fans_alarms():
     f = open("/home/fw/projects/dialin/tests/dg_fans_issues.log", "w")
 
@@ -619,6 +579,37 @@
                 break
 
 
+def test_dvt_drain_pump():
+
+    dg.drain_pump.cmd_drain_pump_set_rpm(2000)
+    try:
+        while True:
+            print(get_drain_states_info(), get_temperature_sensors_info(), get_dg_fans_info())
+            sleep(1)
+    except KeyboardInterrupt:
+        dg.drain_pump.cmd_drain_pump_set_rpm(0)
+
+
+def test_conc_pumps():
+
+    dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(0, True)
+    sleep(1)
+    dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, True)
+    sleep(1)
+    dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(0, 20)
+    sleep(1)
+    dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(1, 20)
+
+    try:
+        while True:
+            print(get_concentrate_pumps_info())
+            sleep(1)
+    except KeyboardInterrupt:
+        dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(0, False)
+        sleep(0.5)
+        dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, False)
+
+
 if __name__ == "__main__":
     dg = DG(log_level='DEBUG')
     dg.cmd_log_in_to_dg()
@@ -639,20 +630,12 @@
 
     #collect_hd_treatment()
 
-    # test_hd_fans_alarms()
-
     # test_dg_fans_alarms()
 
-    dg.drain_pump.cmd_drain_pump_set_rpm(2000)
+    #test_dvt_drain_pump()
 
-    while True:
-        print(get_drain_states_info(), get_temperature_sensors_info(), get_dg_fans_info())
-        #print(hd.hd_debug_events)
-        sleep(1)
+    test_conc_pumps()
 
-
-
-
     #ui = HDSimulator()
     #ui.cmd_send_hd_operation_mode(3, 1)