Index: suite_leahi/tst_headerbar_wifi_indicator/test.py
===================================================================
diff -u -rc641ef1cd371fa90784d7fc843072987ed9c0d92 -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/tst_headerbar_wifi_indicator/test.py	(.../test.py)	(revision c641ef1cd371fa90784d7fc843072987ed9c0d92)
+++ suite_leahi/tst_headerbar_wifi_indicator/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -11,7 +11,7 @@
 
 
 import names
-from configuration import config, utility
+from configuration   import config, utility
 from leahi_dialin.ui import utils
 
 
@@ -25,7 +25,7 @@
         test.log("WiFi Icon found in the Leahi UI")
     test.compare(
         str(waitForObjectExists(names.o_HeaderBar_WiFi_IconImage, 2000).source.path),
-        "/images/iWifi",
+        config.WIFI_IMAGE,
         "Comparison of WiFi Icon Image",
     )
     # Click the WiFi button
@@ -58,7 +58,7 @@
 def main():
     utils.tstStart(__file__)
 
-    startApplication(config.AUT_NAME + "-q")
+    startApplication(utility.aut("-q"))
     headerbar_wifi_popup()
 
     utils.tstDone()