Index: tst_DGOperationMode/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r867655840cada2d79fa5028c8fab68516ea59673
--- tst_DGOperationMode/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_DGOperationMode/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 = [ 
@@ -38,9 +40,9 @@
 
 def test_values(vDGOpMode):
     if (vDGOpMode < len(opModes)):
-        test.compare(str(waitForObjectExists(names.o_managerHome_DGOperationModeData_DGOpMode).text), opModes[vDGOpMode])
+        test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGOperationModeData_DGOpMode, "text", opModes[vDGOpMode])).text), opModes[vDGOpMode])
     else:
-        test.compare(str(waitForObjectExists(names.o_managerHome_DGOperationModeData_DGOpMode).text), "UNDEFINED [{}]".format(vDGOpMode))
+        test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGOperationModeData_DGOpMode, "text", "UNDEFINED [{}]".format(vDGOpMode))).text), "UNDEFINED [{}]".format(vDGOpMode))
 
 
 def main():
@@ -54,21 +56,21 @@
 
     step = 1
     for i in range ( 0, len(opModes), step):
-        denaliMessages.setDGOperationMode(i)
+        HDSimulator.cmd_set_dg_operation_mode(i)
         test_values                      (i)
 
-    denaliMessages.setDGOperationMode(1)
+    HDSimulator.cmd_set_dg_operation_mode(1)
     test_values                      (1)
 
     # Coverage
-    denaliMessages.setDGOperationMode(1)
+    HDSimulator.cmd_set_dg_operation_mode(1)
     test_values                      (1)
 
-    denaliMessages.setDGOperationMode(0)
+    HDSimulator.cmd_set_dg_operation_mode(0)
     test_values                      (0)
 
     outOfRangeCheck = len(opModes) + 1
-    denaliMessages.setDGOperationMode(outOfRangeCheck)
+    HDSimulator.cmd_set_dg_operation_mode(outOfRangeCheck)
     test_values                      (outOfRangeCheck)
 
     utils.tstDone()