Index: tst_HDPressureOcclusionData/test.py
===================================================================
diff -u -rbefca1db0402e031a5b692aa93dc74bfb314eb9e -r867655840cada2d79fa5028c8fab68516ea59673
--- tst_HDPressureOcclusionData/test.py	(.../test.py)	(revision befca1db0402e031a5b692aa93dc74bfb314eb9e)
+++ tst_HDPressureOcclusionData/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_PressureOcclusionData():
@@ -22,11 +24,11 @@
 
 
 def test_values(vArterialPressure, vVenousPressure, vBloodPumpOcclusion, vDialysateInletPumpOcclusion, vDialysateOutletPumpOcclusion):
-    test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_ArterialPressure            ).text), "{:.2f}".format(vArterialPressure            ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_VenousPressure              ).text), "{:.2f}".format(vVenousPressure              ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_BloodPumpOcclusion          ).text), "{}"    .format(vBloodPumpOcclusion          ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion ).text), "{}"    .format(vDialysateInletPumpOcclusion ))
-    test.compare(str(waitForObjectExists(names.o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion).text), "{}"    .format(vDialysateOutletPumpOcclusion))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_ArterialPressure,             "text", "{:.2f}".format(vArterialPressure))).text),         "{:.2f}".format(vArterialPressure))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_VenousPressure,               "text", "{:.2f}".format(vVenousPressure))).text),           "{:.2f}".format(vVenousPressure))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_BloodPumpOcclusion,           "text", "{}"    .format(vBloodPumpOcclusion))).text),       "{}".format(vBloodPumpOcclusion))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_DialysateInletPumpOcclusion,  "text", "{}".format(vDialysateInletPumpOcclusion))).text),  "{}".format(vDialysateInletPumpOcclusion))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_PressureOcclusionData_DialysateOutletPumpOcclusion, "text", "{}".format(vDialysateOutletPumpOcclusion))).text), "{}".format(vDialysateOutletPumpOcclusion))
 
 
 def main():
@@ -40,17 +42,17 @@
 
     step = 10
     for i in range ( 10, 500, step):
-        denaliMessages.setPressureOcclusionData(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4)
+        HDSimulator.cmd_set_pressure_occlusion_data(i, i + step * 1, i + step * 2, i + step * 3, i + step * 4)
         test_values                            (i, i + step * 1, i + step * 2, i + step * 3, i + step * 4)
 
-    denaliMessages.setPressureOcclusionData(100, 200, 300, 400, 500)
+    HDSimulator.cmd_set_pressure_occlusion_data(100, 200, 300, 400, 500)
     test_values                            (100, 200, 300, 400, 500)
 
     # Coverage
-    denaliMessages.setPressureOcclusionData(100, 200, 300, 400, 500)
+    HDSimulator.cmd_set_pressure_occlusion_data(100, 200, 300, 400, 500)
     test_values                            (100, 200, 300, 400, 500)
 
-    denaliMessages.setPressureOcclusionData(0, 0, 0, 0, 0)
+    HDSimulator.cmd_set_pressure_occlusion_data(0, 0, 0, 0, 0)
     test_values                            (0, 0, 0, 0, 0)
 
     utils.tstDone()