Index: suite_leahi/tst_device_settings_wifi/test.py
===================================================================
diff -u -rca8a58fe0abeb3d18a1325d745005c373de81f22 -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/tst_device_settings_wifi/test.py	(.../test.py)	(revision ca8a58fe0abeb3d18a1325d745005c373de81f22)
+++ suite_leahi/tst_device_settings_wifi/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -13,20 +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, 2000)
-    wifi_option = utility.findChildByText(grid_container, "Wi-Fi")
+    wifi_option = utility.findChildByText(grid_container, config.WI_FI)
 
     if wifi_option is not None:
         mouseClick(wifi_option)
     
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000)
     wifi_screen_title_text = utility.findChildByText(
-        headerbar_container, "Wi-Fi"
+        headerbar_container, config.WI_FI
     )
     if wifi_screen_title_text is not None:
         test.compare(
@@ -81,15 +81,14 @@
     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
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000)
     device_setting_screen_headerbar_title_text = utility.findChildByText(
-        headerbar_container, "Device Settings"
+        headerbar_container, config.DEVICE_SETTINGS
     )
     if device_setting_screen_headerbar_title_text is not None:
         test.compare(