Index: suite_leahi/tst_device_settings_wifi/test.py
===================================================================
diff -u -r4e2b2a08fb10fb528e782a505eaab19f63874cc4 -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/tst_device_settings_wifi/test.py	(.../test.py)	(revision 4e2b2a08fb10fb528e782a505eaab19f63874cc4)
+++ suite_leahi/tst_device_settings_wifi/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -13,21 +13,20 @@
 
 
 import names
-from configuration import config, utility, navigation
+from configuration   import config, utility, navigation
 from leahi_dialin.ui import utils
 
 
 def navigate_to_wifi_settings_screen():
-    grid_container = waitForObject(names.o_DeviceSettingsGrid)
-    wifi_option = utility.findChildByText(grid_container, "Wi-Fi")
+    grid_container = waitForObject(names.o_DeviceSettingsGrid, 2000)
+    wifi_option = utility.findChildByText(grid_container, config.WI_FI)
 
     if wifi_option is not None:
         mouseClick(wifi_option)
-
-    wifi_screen_title_text = utility.get_object_from_names(
-        names.o_InformationPageTitleText,
-        error_message="Wi-Fi screen title text object missing",
-        timeout_ms=1000,
+    
+    headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000)
+    wifi_screen_title_text = utility.findChildByText(
+        headerbar_container, config.WI_FI
     )
     if wifi_screen_title_text is not None:
         test.compare(
@@ -82,22 +81,20 @@
     wifi_screen_back_button = utility.get_object_from_names(
         names.o_SettingsBase_WifiScreen_BackButton,
         error_message="WiFi Screen Back Button missing",
-        timeout_ms=1000,
     )
     if wifi_screen_back_button is not None:
         mouseClick(wifi_screen_back_button)
 
     # Verify that UI navigated back to Device Setting Screen by Comparing Device Settings title after clicking on Back Button
-    device_setting_screen_title_text = utility.get_object_from_names(
-        names.o_DeviceSettingsTitleText,
-        error_message="Device Settings Screen title text object missing",
-        timeout_ms=2000,
+    headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000)
+    device_setting_screen_headerbar_title_text = utility.findChildByText(
+        headerbar_container, config.DEVICE_SETTINGS
     )
-    if device_setting_screen_title_text is not None:
+    if device_setting_screen_headerbar_title_text is not None:
         test.compare(
-            device_setting_screen_title_text.text,
+            device_setting_screen_headerbar_title_text.text,
             config.DEVICE_SETTINGS_SCREEN_TITLE_TEXT,
-            "{} screen is displayed after navigating back and Comparison of Device Settings Screen Title text".format(
+            "{} screen is displayed and Comparison of Device Settings Screen Title text".format(
                 config.DEVICE_SETTINGS_SCREEN_TITLE_TEXT
             ),
         )
@@ -109,9 +106,9 @@
     test.startSection(
         "Launch Leahi application and Navigate to Device Settings WiFi screen"
     )
-    startApplication(config.AUT_NAME + "-q")
+    startApplication(utility.aut("-q"))
     navigation.navigate_to_device_settings_screen()
     navigate_to_wifi_settings_screen()
     test.endSection()
     verify_wifi_setting_parameters()
-    test.endSection()
+    test.endSection()
\ No newline at end of file