Index: tst_HDInletFlowData/test.py
===================================================================
diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -r867655840cada2d79fa5028c8fab68516ea59673
--- tst_HDInletFlowData/test.py	(.../test.py)	(revision cea779e4d5eb422603a9194f6b9a01ec7e268612)
+++ tst_HDInletFlowData/test.py	(.../test.py)	(revision 867655840cada2d79fa5028c8fab68516ea59673)
@@ -24,13 +24,13 @@
 
 
 def test_values(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM):
-    test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_FlowSetPoint   ).text),     "{:.2f}".format( vFlowSetPt ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MeasuredFlow   ).text),     "{:.2f}".format( vMeasFlow  ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_RotorSpeed     ).text),     "{:.2f}".format( vRotSpd    ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorSpeed     ).text),     "{:.2f}".format( vMotSpd    ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorCtlSpeed  ).text),     "{:.2f}".format( vMCSpd     ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_MotorCtlCurrent).text),     "{:.2f}".format( vMCCurr    ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_InletFlowData_PWMDutyCycle   ).text), "%" "{:.2f}".format( vPWM       ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_FlowSetPoint   , "text", "{:.2f}"    .format(vFlowSetPt))).text), "{:.2f}".format(vFlowSetPt))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_MeasuredFlow   , "text", "{:.2f}"    .format(vMeasFlow))) .text), "{:.2f}".format(vMeasFlow))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_RotorSpeed     , "text", "{:.2f}"    .format(vRotSpd)))   .text), "{:.2f}".format(vRotSpd))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_MotorSpeed     , "text", "{:.2f}"    .format(vMotSpd)))   .text), "{:.2f}".format(vMotSpd))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_MotorCtlSpeed  , "text", "{:.2f}"    .format(vMCSpd)))    .text), "{:.2f}".format(vMCSpd))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_MotorCtlCurrent, "text", "{:.2f}"    .format(vMCCurr)))   .text), "{:.2f}".format(vMCCurr))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_InletFlowData_PWMDutyCycle   , "text", "%" "{:.2f}".format(vPWM)))      .text), "%" "{:.2f}".format(vPWM))
 
 
 def main():
@@ -44,17 +44,17 @@
 
     step = 10
     for i in range ( 10, 500, step):
-        HDSimulator.setTreatmentDialysateFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6)
+        HDSimulator.cmd_set_treatment_dialysate_flow_rate(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.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700)
+    HDSimulator.cmd_set_treatment_dialysate_flow_rate(100, 200, 300, 400, 500, 600, 700)
     test_values                                 (100, 200, 300, 400, 500, 600, 700)
 
     # Coverage
-    HDSimulator.setTreatmentDialysateFlowRate(100, 200, 300, 400, 500, 600, 700)
+    HDSimulator.cmd_set_treatment_dialysate_flow_rate(100, 200, 300, 400, 500, 600, 700)
     test_values                                 (100, 200, 300, 400, 500, 600, 700)
 
-    HDSimulator.setTreatmentDialysateFlowRate(0, 0, 0, 0, 0, 0, 0)
+    HDSimulator.cmd_set_treatment_dialysate_flow_rate(0, 0, 0, 0, 0, 0, 0)
     test_values                                 (0, 0, 0, 0, 0, 0, 0)
 
     utils.tstDone()