Index: tst_DGDrainPumpData/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r40314c67874695eefc506c3a6a33896495953edd
--- tst_DGDrainPumpData/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_DGDrainPumpData/test.py	(.../test.py)	(revision 40314c67874695eefc506c3a6a33896495953edd)
@@ -13,41 +13,48 @@
 #
 
 import names
-from dialin.squish import utils, denaliMessages
+from dialin.ui import utils
+from configuration import config, utility
 
 
 def gotoScreenNtest_Contains_DGDrainPumpData():
-    mouseClick(waitForObject(names.o_mainMenu_manager))
+    menuManager = utility.get_object_from_names(names.o_mainMenu_manager, "names.o_mainMenu_manager object missing")
+    if menuManager is not None:
+        mouseClick(menuManager)
     test_values(0, 0)
 
-
 def test_values(vSetPtRPM, vDACValue):
+    test.fail(f"TODO : need to update to get text of drain pump data to compare ({vSetPtRPM}, {vDACValue})...return")
+    return
+
     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 setDGDrainPumpData(vValue1, vValue2):
+    test.fail("TODO: need to populate body, used to be : denaliMessages.setDGDrainPumpData({vValue1}, {vValue2})")
 
 def main():
     utils.tstStart(__file__)
 
-    startApplication(names.AUT_NAME)
+    startApplication(config.AUT_NAME)
     utils.waitForGUI(1)
 
     gotoScreenNtest_Contains_DGDrainPumpData()
     utils.waitForGUI(1)
 
     step = 10
     for i in range ( 10, 500, step):
-        denaliMessages.setDGDrainPumpData(i, i + step * 1)
+        setDGDrainPumpData(i, i + step * 1)
         test_values                      (i, i + step * 1)
 
-    denaliMessages.setDGDrainPumpData(100, 200)
+    setDGDrainPumpData(100, 200)
     test_values                      (100, 200)
 
-    denaliMessages.setDGDrainPumpData(100, 200)
+    setDGDrainPumpData(100, 200)
     test_values                      (100, 200)
 
     # Coverage
-    denaliMessages.setDGDrainPumpData(0, 0)
+    setDGDrainPumpData(0, 0)
     test_values                      (0, 0)
 
     utils.tstDone()