Index: tst_HDBloodFlowData/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r867655840cada2d79fa5028c8fab68516ea59673
--- tst_HDBloodFlowData/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_HDBloodFlowData/test.py	(.../test.py)	(revision 867655840cada2d79fa5028c8fab68516ea59673)
@@ -13,7 +13,9 @@
 #
 
 import names
-from dialin.squish import utils, denaliMessages
+from dialin.ui import utils
+from dialin import HDSimulator
+HDSimulator = HDSimulator()
 
 
 def gotoScreenNtest_Contains_BloodFlowData():
@@ -22,13 +24,13 @@
 
 
 def test_values(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM):
-    test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_FlowSetPoint   ).text),     "{:.0f}".format( vFlowSetPt ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MeasuredFlow   ).text),     "{:.2f}".format( vMeasFlow  ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_RotorSpeed     ).text),     "{:.2f}".format( vRotSpd    ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorSpeed     ).text),     "{:.2f}".format( vMotSpd    ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlSpeed  ).text),     "{:.2f}".format( vMCSpd     ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlCurrent).text),     "{:.2f}".format( vMCCurr    ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_PWMDutyCycle   ).text), "%" "{:.2f}".format( vPWM       ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_FlowSetPoint   , "text", "{:.0f}".format( vFlowSetPt ))).text),     "{:.0f}".format( vFlowSetPt     ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MeasuredFlow   , "text", "{:.2f}".format( vMeasFlow  ))).text),     "{:.2f}".format( vMeasFlow      ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_RotorSpeed     , "text", "{:.2f}".format( vRotSpd    ))).text),     "{:.2f}".format( vRotSpd        ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorSpeed     , "text", "{:.2f}".format( vMotSpd    ))).text),     "{:.2f}".format( vMotSpd        ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlSpeed  , "text", "{:.2f}".format( vMCSpd     ))).text),     "{:.2f}".format( vMCSpd         ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlCurrent, "text", "{:.2f}".format( vMCCurr    ))).text),     "{:.2f}".format( vMCCurr        ))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_PWMDutyCycle   , "text", "%" "{:.2f}".format( vPWM   ))).text), "%" "{:.2f}".format( vPWM       ))
 
 
 def main():
@@ -42,17 +44,17 @@
 
     step = 10
     for i in range ( 10, 500, step):
-        denaliMessages.setTreatmentBloodFlowRate(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4, i + step * 5, i + step * 6)
+        HDSimulator.cmd_set_treatment_blood_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)
 
-    denaliMessages.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700)
+    HDSimulator.cmd_set_treatment_blood_flow_rate(100, 200, 300, 400, 500, 600, 700)
     test_values                             (100, 200, 300, 400, 500, 600, 700)
 
     # Coverage
-    denaliMessages.setTreatmentBloodFlowRate(100, 200, 300, 400, 500, 600, 700)
+    HDSimulator.cmd_set_treatment_blood_flow_rate(100, 200, 300, 400, 500, 600, 700)
     test_values                             (100, 200, 300, 400, 500, 600, 700)
 
-    denaliMessages.setTreatmentBloodFlowRate(0, 0, 0, 0, 0, 0, 0)
+    HDSimulator.cmd_set_treatment_blood_flow_rate(0, 0, 0, 0, 0, 0, 0)
     test_values                             (0, 0, 0, 0, 0, 0, 0)
 
     utils.tstDone()