Index: tst_HDOperationModeData/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r867655840cada2d79fa5028c8fab68516ea59673
--- tst_HDOperationModeData/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_HDOperationModeData/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()
 
 
 opModes = [ 
@@ -35,9 +37,9 @@
 
 def test_values(vOpMode):
     if (vOpMode < len(opModes)):
-        test.compare(str(waitForObjectExists(names.o_managerHome_HDOperationModeData_OpMode).text), opModes[vOpMode])
+        test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_HDOperationModeData_OpMode, "text", opModes[vOpMode])).text), opModes[vOpMode])
     else:
-        test.compare(str(waitForObjectExists(names.o_managerHome_HDOperationModeData_OpMode).text), "UNDEFINED [{}]".format(vOpMode))
+        test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_HDOperationModeData_OpMode, "text", "UNDEFINED [{}]".format(vOpMode))).text), "UNDEFINED [{}]".format(vOpMode))
 
 
 def main():
@@ -51,21 +53,21 @@
 
     step = 1
     for i in range ( 0, len(opModes), step):
-        denaliMessages.setHDOperationModeData(i + step * 0)
+        HDSimulator.cmd_set_hd_operation_mode_data(i + step * 0)
         test_values                          (i + step * 0)
 
-    denaliMessages.setHDOperationModeData(1)
+    HDSimulator.cmd_set_hd_operation_mode_data(1)
     test_values                          (1)
 
     # Coverage
-    denaliMessages.setHDOperationModeData(1)
+    HDSimulator.cmd_set_hd_operation_mode_data(1)
     test_values                          (1)
 
-    denaliMessages.setHDOperationModeData(0)
+    HDSimulator.cmd_set_hd_operation_mode_data(0)
     test_values                          (0)
 
     outOfRangeCheck = len(opModes) + 1
-    denaliMessages.setHDOperationModeData(outOfRangeCheck)
+    HDSimulator.cmd_set_hd_operation_mode_data(outOfRangeCheck)
     test_values                          (outOfRangeCheck)
 
     utils.tstDone()