Index: tst_DGDrainPumpData/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r867655840cada2d79fa5028c8fab68516ea59673
--- tst_DGDrainPumpData/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_DGDrainPumpData/test.py	(.../test.py)	(revision 867655840cada2d79fa5028c8fab68516ea59673)
@@ -13,17 +13,19 @@
 #
 
 import names
-from dialin.squish import utils, denaliMessages
+from dialin.ui import utils
+from dialin import HDSimulator
+HDSimulator = HDSimulator()
 
 
 def gotoScreenNtest_Contains_DGDrainPumpData():
     mouseClick(waitForObject(names.o_mainMenu_manager))
     test_values(0, 0)
 
 
-def test_values(vSetPtRPM, vDACValue):
-    test.compare(str(waitForObjectExists(names.o_managerHome_DGDrainPumpData_SetPtRPM).text), "{:.0f}".format(vSetPtRPM))
-    test.compare(str(waitForObjectExists(names.o_managerHome_DGDrainPumpData_DACValue).text), "{:.0f}".format(vDACValue))
+def test_values(vSetPtRPM, vDACValue):   
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGDrainPumpData_SetPtRPM, "text", "{:.0f}".format(vSetPtRPM))).text), "{:.0f}".format(vSetPtRPM))
+    test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_DGDrainPumpData_DACValue, "text", "{:.0f}".format(vDACValue))).text), "{:.0f}".format(vDACValue))
 
 
 def main():
@@ -37,17 +39,17 @@
 
     step = 10
     for i in range ( 10, 500, step):
-        denaliMessages.setDGDrainPumpData(i, i + step * 1)
+        HDSimulator.cmd_set_dg_drain_pump_data(i, i + step * 1)
         test_values                      (i, i + step * 1)
 
-    denaliMessages.setDGDrainPumpData(100, 200)
+    HDSimulator.cmd_set_dg_drain_pump_data(100, 200)
     test_values                      (100, 200)
 
-    denaliMessages.setDGDrainPumpData(100, 200)
+    HDSimulator.cmd_set_dg_drain_pump_data(100, 200)
     test_values                      (100, 200)
 
     # Coverage
-    denaliMessages.setDGDrainPumpData(0, 0)
+    HDSimulator.cmd_set_dg_drain_pump_data(0, 0)
     test_values                      (0, 0)
 
     utils.tstDone()