Index: tst_ServiceShutdown/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24
--- tst_ServiceShutdown/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_ServiceShutdown/test.py	(.../test.py)	(revision 2cebcfa1c6995bc48c71bcf7367e2695a8d1cb24)
@@ -13,7 +13,7 @@
 #
 
 import names
-from dialin.squish import utils, globals, denaliMessages
+from dialin.squish import utils, denaliMessages
 
 
 ################################################################################
@@ -23,19 +23,19 @@
 
 def test_MainMenu_CurrentItem(vSRSUI=""):
     # test.compare(waitForObjectExists(names.o_mainMenu).currentIndex, 0)
-    test.compare(str(waitForObjectExists(names.o_mainMenu).currentTitle), "Treatment", globals.SRSUI(vSRSUI))
+    test.compare(str(waitForObjectExists(names.o_mainMenu).currentTitle), "Treatment", utils.SRSUI(vSRSUI))
 
 def gotoScreenNtest_Contains_PowerOffButton(vSRSUI=""):
     mouseClick  (waitForObjectExists(names.o_mainMenu_settings))
     utils.waitForGUI()
-    test.compare(waitForObjectExists(names.o_settingsHome).visible, True, globals.SRSUI(vSRSUI))
+    test.compare(waitForObjectExists(names.o_settingsHome).visible, True, utils.SRSUI(vSRSUI))
     # the settings test page reverted back and it's no longer on the diagnostic page. 
     #mouseClick(waitForObjectExists(names.o_diagnostics))
 
 def gotoScreenNtest_Contains_TreatmentHome(vSRSUI=""):
     mouseClick  (waitForObjectExists(names.o_mainMenu_treatment))
     utils.waitForGUI()
-    test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, globals.SRSUI(vSRSUI))
+    test.compare(waitForObjectExists(names.o_treatmentHome).visible, True, utils.SRSUI(vSRSUI))
 
 def showNtest_PowerOffDialog(vSRSUI=""):
     denaliMessages.show_PowerOffDialog()
@@ -46,7 +46,7 @@
     test_PowerOffButton(vSRSUI)
 
 def showNtest_PowerOffNotificationDialog(vSRSUI=""):
-    mSRSUI = globals.SRSUI(vSRSUI)
+    mSRSUI = utils.SRSUI(vSRSUI)
     denaliMessages.show_PowerOffNotificationDialog()
     test.compare(str(waitForObjectExists(names.o_poweroff_notification).baseUrl.path), "/dialogs/AutoHideInfo.qml", mSRSUI + " - Dialog")
     constantPartOfTheMessage = "System is shutting down" 
@@ -55,7 +55,7 @@
     utils.waitForGUI(1)  # animation transition
     
 def showNtest_PowerOffRejectionDialog(vSRSUI=""):
-    mSRSUI = globals.SRSUI(vSRSUI)
+    mSRSUI = utils.SRSUI(vSRSUI)
     denaliMessages.show_PowerOffRejectionDialog()
     test.compare(str(waitForObjectExists(names.o_poweroff_rejection).baseUrl.path), "/dialogs/AutoHideInfo.qml", mSRSUI + " - Dialog")
     constantPartOfTheMessage = "Cannot shutdown during "  # there might be the reason, concatenated at the end of the string. 
@@ -65,18 +65,18 @@
 
     
 def test_PowerOffButton(vSRSUI=""):
-    test.compare(waitForObjectExists(names.o_poweroffButton).visible, True, globals.SRSUI(vSRSUI))
+    test.compare(waitForObjectExists(names.o_poweroffButton).visible, True, utils.SRSUI(vSRSUI))
 
 def test_PowerOffDialog(vSRSUI=""):
-    test.compare(waitForObjectExists(names.o_modalDialog).visible, True, globals.SRSUI(vSRSUI))
+    test.compare(waitForObjectExists(names.o_modalDialog).visible, True, utils.SRSUI(vSRSUI))
 
 def testNclick_ShutdownButton_onPowerOffConfirm(vSRSUI=""):
-    test.compare(waitForObjectExists(names.o_poweroff_shutdown).visible, True, globals.SRSUI(vSRSUI))
+    test.compare(waitForObjectExists(names.o_poweroff_shutdown).visible, True, utils.SRSUI(vSRSUI))
     mouseClick  (waitForObjectExists(names.o_poweroff_shutdown))
     utils.waitForGUI  (1)  # Wait for the animation
     
 def testNclick_CancelButton_onPowerOffConfirm(vSRSUI=""):
-    test.compare(waitForObjectExists(names.o_poweroff_cancel).visible, True, globals.SRSUI(vSRSUI))
+    test.compare(waitForObjectExists(names.o_poweroff_cancel).visible, True, utils.SRSUI(vSRSUI))
     mouseClick  (waitForObjectExists(names.o_poweroff_cancel))
     utils.waitForGUI  (1)  # Wait for the animation
     
@@ -92,7 +92,7 @@
     test_MainMenu_CurrentItem(535)
     
     # 028 : The Home Screen shall display a "Settings" button.
-    test.compare(str(waitForObjectExists(names.o_mainMenu_settings).text.text), "Settings", globals.SRSUI(28))
+    test.compare(str(waitForObjectExists(names.o_mainMenu_settings).text.text), "Settings", utils.SRSUI(28))
     utils.waitForGUI()
     
     # 029 : Upon "Settings" button depress on the Home Screen; the UI shall navigate the user to the Device Settings Screen.