Index: tst_HomeScreen/test.py
===================================================================
diff -u -r93fe289e1e33e4b2cf824e30f810490f073ecab3 -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7
--- tst_HomeScreen/test.py	(.../test.py)	(revision 93fe289e1e33e4b2cf824e30f810490f073ecab3)
+++ tst_HomeScreen/test.py	(.../test.py)	(revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7)
@@ -23,26 +23,26 @@
     utils.waitForGUI(1)
 
     test.compare(    waitForObjectExists(names.o_treatmentHome).visible, True)
-    test.compare(str(waitForObjectExists(names.o_treatmentHome_startTreatment ).text.text), "START TREATMENT"           , "SRSUI 024")
-    test.compare(str(waitForObjectExists(names.o_treatmentHome_createTreatment).text.text), "CREATE TREATMENT"          , "SRSUI 532")
+    test.compare(str(waitForObjectExists(names.o_treatmentHome_startTreatment ).text.text), "START TREATMENT"           , utils.SRSUI(24))
+    test.compare(str(waitForObjectExists(names.o_treatmentHome_createTreatment).text.text), "CREATE TREATMENT"          , utils.SRSUI(532))
 
     test.compare(    waitForObjectExists(names.o_mainMenu).visible, True)
-    test.compare(str(waitForObjectExists(names.o_mainMenu_treatment).text.text), "Treatment"                            , "SRSUI 534")
-    test.compare(str(waitForObjectExists(names.o_mainMenu_manager  ).text.text), "Manager"                              , "SRSUI 026")
-    test.compare(str(waitForObjectExists(names.o_mainMenu_settings ).text.text), "Settings"                             , "SRSUI 028")
+    test.compare(str(waitForObjectExists(names.o_mainMenu_treatment).text.text), "Treatment"                            , utils.SRSUI(534))
+    test.compare(str(waitForObjectExists(names.o_mainMenu_manager  ).text.text), "Manager"                              , utils.SRSUI(26))
+    test.compare(str(waitForObjectExists(names.o_mainMenu_settings ).text.text), "Settings"                             , utils.SRSUI(28))
     utils.waitForGUI()
     
     mouseClick  (waitForObjectExists(names.o_mainMenu_manager))
     utils.waitForGUI()
-    test.compare(waitForObjectExists(names.o_managerHome  ).visible, True                                               , "SRSUI 027")
+    test.compare(waitForObjectExists(names.o_managerHome  ).visible, True                                               , utils.SRSUI(27))
 
     mouseClick  (waitForObjectExists(names.o_mainMenu_settings ))
     utils.waitForGUI()
-    test.compare(waitForObjectExists(names.o_settingsHome ).visible, True                                               , "SRSUI 029")
+    test.compare(waitForObjectExists(names.o_settingsHome ).visible, True                                               , utils.SRSUI(29))
 
     mouseClick  (waitForObjectExists(names.o_mainMenu_treatment))
     utils.waitForGUI()
-    test.compare(waitForObjectExists(names.o_treatmentHome).visible, True                                               , "SRSUI 535")
+    test.compare(waitForObjectExists(names.o_treatmentHome).visible, True                                               , utils.SRSUI(535))
     
     utils.tstDone()