Index: tst_HDOutletFlowData/test.py
===================================================================
diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673
--- tst_HDOutletFlowData/test.py	(.../test.py)	(revision cea779e4d5eb422603a9194f6b9a01ec7e268612)
+++ tst_HDOutletFlowData/test.py	(.../test.py)	(revision 867655840cada2d79fa5028c8fab68516ea59673)
@@ -24,13 +24,13 @@
 
 
 def test_values(vRefUFVol, vMeasUFVol, vRotorSpeed, vMotorSpeed, vMotorCtlSpeed, vMotorCtlCurrent, vPWMDtCycle):
-    test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RefUFVol       ).text),     "{:.3f}".format(utils.ml2l(vRefUFVol       )))
-    test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MeasUFVol      ).text),     "{:.3f}".format(utils.ml2l(vMeasUFVol      )))
-    test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_RotorSpeed     ).text),     "{:.2f}".format(           vRotorSpeed      ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorSpeed     ).text),     "{:.2f}".format(           vMotorSpeed      ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorCtlSpeed  ).text),     "{:.2f}".format(           vMotorCtlSpeed   ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_MotorCtlCurrent).text),     "{:.2f}".format(           vMotorCtlCurrent ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_OutletFlowData_PWMDtCycle     ).text), "%" "{:.2f}".format(           vPWMDtCycle      ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_RefUFVol,       "text", "{:.3f}".format(utils.ml2l(vRefUFVol)))).text),  "{:.3f}".format(utils.ml2l(vRefUFVol)))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_MeasUFVol,      "text", "{:.3f}".format(utils.ml2l(vMeasUFVol)))).text), "{:.3f}".format(utils.ml2l(vMeasUFVol)))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_RotorSpeed,     "text", "{:.2f}".format(vRotorSpeed))).text),            "{:.2f}".format(vRotorSpeed))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_MotorSpeed,     "text", "{:.2f}".format(vMotorSpeed))).text),            "{:.2f}".format(vMotorSpeed))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_MotorCtlSpeed,  "text", "{:.2f}".format(vMotorCtlSpeed))).text),         "{:.2f}".format(vMotorCtlSpeed))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_MotorCtlCurrent,"text", "{:.2f}".format(vMotorCtlCurrent))).text),       "{:.2f}".format(vMotorCtlCurrent))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_OutletFlowData_PWMDtCycle,     "text", "%" "{:.2f}".format(vPWMDtCycle))).text),        "%" "{:.2f}".format(vPWMDtCycle))
 
 
 def main():
@@ -44,17 +44,17 @@
 
     step = 10
     for i in range ( 10, 500, step):
-        HDSimulator.setTreatmentUltrafiltration(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6)
+        HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6)
         test_values                               (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6)
 
-    HDSimulator.setTreatmentUltrafiltration(100, 200, 300, 400, 500, 600, 700)
+    HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(100, 200, 300, 400, 500, 600, 700)
     test_values                               (100, 200, 300, 400, 500, 600, 700)
 
     # Coverage
-    HDSimulator.setTreatmentUltrafiltration(100, 200, 300, 400, 500, 600, 700)
+    HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(100, 200, 300, 400, 500, 600, 700)
     test_values                               (100, 200, 300, 400, 500, 600, 700)
 
-    HDSimulator.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0)
+    HDSimulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(0, 0, 0, 0, 0, 0, 0)
     test_values                               (0, 0, 0, 0, 0, 0, 0)
 
     utils.tstDone()