Index: tests/dg_tests.py
===================================================================
diff -u -r5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068 -r920d1a0826639951cd7f6cfa07b41dc175083043
--- tests/dg_tests.py	(.../dg_tests.py)	(revision 5ec51022d4c81fba0406aecfbb9b5cdfe4f7d068)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 920d1a0826639951cd7f6cfa07b41dc175083043)
@@ -113,7 +113,7 @@
 def get_dg_reservoirs_info():
     info = ('Time_rsrvr_cycle, {}, Time_rsrvr_fill_2_switch, {}, Time_uf_decay, {:5.3f}, Temp_uf_fill, {:5.3f}, '
             'Temp_rsrvr_use_actual, {:5.3f}, Temp_rsrvr_end_fill, {:5.3}, Temp_avg_fill, {:5.3f}, '
-            'Temp_last_fill, {:5.3f}, Time_rsrvr_fill, '
+            'Temp_last_fill, {:5.3f}, Time_rsrvr_fill, {:5.3f}, '
             .format(dg.reservoirs.time_reservoir_cycle, dg.reservoirs.time_reservoir_fill_2_switch,
                     dg.reservoirs.time_uf_decay, dg.reservoirs.temp_uf_fill, dg.reservoirs.temp_reservoir_use_actual,
                     dg.reservoirs.temp_reservoir_end_fill, dg.reservoirs.temp_avg_fill, dg.reservoirs.temp_last_fill,
@@ -203,7 +203,7 @@
             .format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.primary_heater_state,
                     dg.heaters.trimmer_heater_duty_cycle, dg.heaters.trimmer_heater_state,
                     dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature,
-                    dg.heaters.primary_efficiency, dg.heaters.primary_heaters_target_temperature,
+                    dg.heaters.primary_efficiency, dg.heaters.primary_calc_target_temperature,
                     dg.heaters.trimmer_calc_target_temperature,
                     dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_PRIM_HTR_V.value],
                     dg.voltages.monitored_voltages[DGMonitoredVoltages.MONITORED_LINE_24V_TRIM_HTR_V.value]))
@@ -609,11 +609,11 @@
 
     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)
+    #dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, True)
+   # sleep(1)
+    dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(0, 35)
+    #sleep(1)
+    #dg.concentrate_pumps.cmd_concentrate_pump_target_speed_override(1, 20)
 
     try:
         while True:
@@ -625,6 +625,22 @@
         dg.concentrate_pumps.cmd_concentrate_pump_state_change_request(1, False)
 
 
+def test_hd_valves():
+    while True:
+
+        #VALVE_POSITION_A_INSERT_EJECT = 1
+        #VALVE_POSITION_B_OPEN = 2
+        #VALVE_POSITION_C_CLOSE = 3
+        #
+
+        hd.valves.cmd_set_hd_valve_position(3,3)
+        sleep(2)
+        hd.valves.cmd_set_hd_valve_position(3,2)
+        sleep(2)
+        hd.valves.cmd_set_hd_valve_position(3,1)
+        sleep(2)
+
+
 if __name__ == "__main__":
     dg = DG(log_level='DEBUG')
     dg.cmd_log_in_to_dg()
@@ -641,7 +657,7 @@
 
     # cmd_set_disinfect_ui_screen()
 
-    collect_treatment_data()
+    #collect_treatment_data()
 
     #collect_hd_treatment()
 
@@ -657,9 +673,12 @@
 
     #test_dvt_drain_pump()
 
-    #test_conc_pumps()
+    test_conc_pumps()
 
     #ui = HDSimulator()
     #ui.cmd_send_hd_operation_mode(3, 1)
 
+    #test_hd_valves()
 
+
+