Index: tests/dg_tests.py
===================================================================
diff -u -rbddfb595199bfe5d01671d31c218a2f647f6d7d3 -r8bc7a5336b8f69192918eafc465ee1094537f96d
--- tests/dg_tests.py	(.../dg_tests.py)	(revision bddfb595199bfe5d01671d31c218a2f647f6d7d3)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 8bc7a5336b8f69192918eafc465ee1094537f96d)
@@ -49,6 +49,7 @@
 from dialin.hd.voltages import HDMonitoredVoltages
 from dialin.hd.pretreatment import PreTreatmentRsrvrState
 from dialin.common.dg_defs import DGFlushStates, DGHeatDisinfectActiveCoolStates, DGROPermeateSampleSates
+from dialin.dg.ro_permeate_sample import ROPermeateDispenseMsgStatus
 from dialin.common.test_config_defs import DGTestConfigOptions, HDTestConfigOptions
 from time import sleep
 from datetime import datetime
@@ -134,8 +135,11 @@
     overall_elapsed_time = dg.ro_permeate_sample.overall_elapsed_time
     state_elapsed_time = dg.ro_permeate_sample.state_elapsed_time
 
-    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, '
-            .format(state, overall_elapsed_time, state_elapsed_time))
+    info = ('State, {}, Overall_elapsed_time, {}, State_elapsed_time, {}, dispense_vol_ml, {:5.3f}, dispense_msg, {}, '
+            'dg_op_mode, {}, '
+            .format(state, overall_elapsed_time, state_elapsed_time, dg.ro_permeate_sample.dispensed_volume_ml,
+                    ROPermeateDispenseMsgStatus(dg.ro_permeate_sample.ro_permeate_dispense_message_status).name,
+                    dg.dg_operation_mode))
     return info
 
 
@@ -331,9 +335,10 @@
 
 def get_concentrate_pumps_info():
     info = ('Bicarb_curr_speed, {:5.3f}, Bicarb_speed, {:5.3f}, Acid_curr_speed, {:5.3f}, Acid_speed, {:5.3f}, '
-            'CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, CPo_status, {}, '
-            'CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, Acid_tgt_speed, {:5.3f}, '
-            'Bicarb_tgt_speed, {:5.3f}, CP1_parked, {}, CP1_park_fault, {}, CP2_parked, {}, CP2_park_fault, {}, '
+            'CPi, {:5.3f}, CPo, {:5.3f}, CD1, {:5.3f}, CD2, {:5.3f}, CP1_state, {}, CP2_state, {}, CPi_status, {}, '
+            'CPo_status, {}, CD1_status, {}, CD2_status, {}, CP1_pulse, {:5.3f}, CP2_pulse, {:5.3f}, '
+            'Acid_tgt_speed, {:5.3f}, Bicarb_tgt_speed, {:5.3f}, CP1_parked, {}, CP1_park_fault, {}, CP2_parked, {}, '
+            'CP2_park_fault, {}, '
             .format(dg.concentrate_pumps.concentrate_pump_cp2_current_set_speed,
                     dg.concentrate_pumps.concentrate_pump_cp2_measured_speed,
                     dg.concentrate_pumps.concentrate_pump_cp1_current_set_speed,
@@ -431,8 +436,16 @@
     #dg.concentrate_pumps.cmd_concentrate_pump_broadcast_interval_override(50)
     #sleep(1)
 
+    dg.test_configs.cmd_set_test_config(DGTestConfigOptions.TEST_CONFIG_MIX_WITH_WATER.value)
+    sleep(0.5)
+    hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_USE_WET_CARTRIDGE.value)
+    sleep(0.5)
+    hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_SKIP_DISINFECT_AND_SERVICE_TX_BLOCKERS.value)
+    sleep(0.5)
+    hd.test_configs.cmd_set_test_config(HDTestConfigOptions.TEST_CONFIG_DISABLE_WET_SELFTEST_DISPLACEMENT_CHECK.value)
+
     #dg.hd_proxy.cmd_start_stop_dg()
-    #sleep(1)
+    #sleep(4)
 
     #dg.hd_proxy.cmd_fill()
 
@@ -711,15 +724,16 @@
 
     #run_chemical_disinfect()
 
-    #hd.alarms.cmd_alarm_state_override(319, 1)
+    #hd.alarms.cmd_alarm_state_override(301, 1)
+    #dg.ro_permeate_sample.cmd_send_hd_dg_is_ready_to_dispense()
 
     #run_dg()
 
     # cmd_set_disinfect_ui_screen()
 
-    #collect_treatment_data()
+    collect_treatment_data()
 
-    run_ro_permeate_sample()
+    #run_ro_permeate_sample()
 
     #collect_hd_treatment()