Index: suite_leahi/shared/scripts/configuration/config.py
===================================================================
diff -u -r8f9df8e70510cbd35fcefa54812b16bf0ee0e3ff -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision 8f9df8e70510cbd35fcefa54812b16bf0ee0e3ff)
+++ suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -29,6 +29,7 @@
 ]
 SERIVCES_TITLE = "Service"
 WATER_PARAMETERS = ["Water Configuration", "Water Input"]
+
 # General Alarm Requirements Instruction
 NUM_OF_ALARM_PRIORITIES = 4           # Total number of alarm priorities
 ALARM_MUTE_FLAG                    = 0B0000001000000000
@@ -39,24 +40,28 @@
     2 :  'ALARM_PRIORITY_MEDIUM',            
     3 :  'ALARM_PRIORITY_HIGH',                
 }
+MUTE = "Mute"
+UMMUTE = "UnMute"
+IMAGE_BELLOFF_STATE = "/images/iBellOff"
+IMAGE_BELLON_STATE = "/images/iBellOn"
+ALARMS_COLORS_HEADER = {
+    "ALARM_PRIORITY_NONE"        : "#438feb",   
+    "ALARM_PRIORITY_LOW"         : "#db8f00",    
+    "ALARM_PRIORITY_MEDIUM"      : "#db8f00", 
+    "ALARM_PRIORITY_HIGH"        : "#c53b33"
+}
+ALARM_REJECT_NOTIFICATION_TEMPLATE = "No Active Alarm List [{}]"
 
 #HeaderBar WiFi 
 WIFI_POPUP_TEXT = "WiFi Connection Error"
+WIFI_IMAGE = "/images/iWifi"
 
 # Device Settings WiFi
 WIFI_TEXT = "Wi-Fi"
 WIFI_PARAMETERS_TEXTS = ["SSID", "IP Address", "Gateway", "Subnet Mask", "DNS"]
 WIFI_SCREEN_SCAN_BUTTON_TEXT = "SCAN"
 DISABLED = False
 
-ALARMS_COLORS_HEADER = {
-    "ALARM_PRIORITY_NONE"        : "#438feb",   
-    "ALARM_PRIORITY_LOW"         : "#db8f00",    
-    "ALARM_PRIORITY_MEDIUM"      : "#db8f00", 
-    "ALARM_PRIORITY_HIGH"        : "#c53b33"
-}
-ALARM_REJECT_NOTIFICATION_TEMPLATE = "No Active Alarm List [{}]"
-
 #Create Rx
 ACID_CONCENTRATE            = ["1.0 K, 2.50 Ca, 1 Mg","2.0 K, 2.50 Ca, 1 Mg","3.0 K, 2.50 Ca, 1 Mg"]
 DIALYZER_TYPE               = ["Diacap Pro 13H","Diacap Pro 16H", "Diacap Pro 19H", "Optiflux F160NRe", "Optiflux F180NRe", "Optiflux F200NRe","Optiflux F250NRe"]
@@ -91,8 +96,32 @@
 SERVICE_SCREEN_TITLE_TEXT = "Service"
 ADVANCED_MODES_SCREEN_TITLE_TEXT = "Advanced Mode"
 DATE_AND_TIME_SCREEN_TITLE_TEXT = "Date and Time"
+TIME = "Time"
 DATE_AND_TIME_PARAMETERS_TEXTS = ["NTP", "(Network Time Protocol)", "Time", "(HH:mm:ss)", "Date", "(MM/dd/yyyy)"]
 ENABLE_ROOT_SSH_SCREEN_TITLE_TEXT = "Enable Root SSH"
 ENABLE_ROOT_SSH_PARAMETERS_TEXTS = ["Enable SSH Login", "Enable Root Login"]
 FACTORY_RESET_SCREEN_TITLE_TEXT = "Factory Reset"
-FACTORY_RESET_SCREEN_TEXT = "Do you want to perform the factory reset?"
\ No newline at end of file
+FACTORY_RESET_SCREEN_TEXT = "Do you want to perform the factory reset?"
+SET_PASSWORD = "Set Password"
+
+#Device Settings Options
+DEVICE_SETTINGS = "Device Settings"
+ADVANCED_MODE = "Advanced Mode"
+DEVICE_INFORMATION = "Device Information"
+WI_FI = "Wi-Fi"
+DEVICE_CLEANING = "Device Cleaning"
+SERVICE = "Service"
+EXPORT_LOGS = "Export Logs"
+VOLUME_AND_BRIGHTNESS = "Volume And Brightness"
+FEATURE_CONFIGURATIONS = "Feature Configurations"
+ADVANCED_INSTITUTIONAL_SETTINGS = "Advanced Institutional Settings"
+FACTORY_RESET = "Factory Reset"
+ENABLE_ROOT_SSH = "Enable Root SSH"
+INSTITUTIONAL_CONFIGURATIONS = "Institutional Configurations"
+DATE_AND_TIME = "Date and Time"
+LANGUAGE = "Language"
+
+#Menu Bar
+PRESCRIPTIONS = "Prescriptions"
+TREATMENT = "Treatment"
+SETTINGS = "Settings"
\ No newline at end of file
Index: suite_leahi/shared/scripts/configuration/navigation.py
===================================================================
diff -u -r8f9df8e70510cbd35fcefa54812b16bf0ee0e3ff -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/shared/scripts/configuration/navigation.py	(.../navigation.py)	(revision 8f9df8e70510cbd35fcefa54812b16bf0ee0e3ff)
+++ suite_leahi/shared/scripts/configuration/navigation.py	(.../navigation.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -14,14 +14,14 @@
     td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0)
     headerbar_container = squish.waitForObject(names.o_mainMenu_MainMenu, 2000)
     settings_menu_object = utility.findChildByText(
-        headerbar_container, "Settings"
+        headerbar_container, config.SETTINGS
     )
     if settings_menu_object is not None:
         squish.mouseClick(settings_menu_object)
     
     headerbar_container = squish.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(
@@ -44,7 +44,7 @@
     """
     test.startSection("Method to navigation in the pretreatment page ")
     stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator)
-    values = utility.findAllObjectsById(stepId, "_text")
+    values = utility.findAllChildrenById(stepId, "_text")
     for index, input_field in enumerate(values[2:]):
         test.log(str(index));
         test.log(str(input_field.text))
Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -r733e6e27c1d88e9615ab0d2ac422d8e5d87de89e -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 733e6e27c1d88e9615ab0d2ac422d8e5d87de89e)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -14,6 +14,51 @@
     """
     Joins the executable name and argument 
     into a single command string
+* Options:
+ *   -h, --help                           Displays help on commandline options.
+ *   --help-all                           Displays help including Qt specific
+ *                                        options.
+ *   -v, --version                        Displays version information.
+ *   -c, --canOut                         Show the Can Frame Output
+ *   -m, --msgOut                         Show the Message Output
+ *   -l, --logOut                         Show the Logs Output
+ *   -0, --enable-keep-awake              Enable send low priority, empty message
+ *                                        on the CANBus just to keep UI board CAN
+ *                                        driver awake
+ *   -i, --fake-interval <interval>       Test fake message interval(ms)
+ *   -f, --fake-message <data>            Test fake message data
+ *                                        will use default sequenced long fake
+ *                                        message if set to 00(default)
+ *                                        will used only if correct integer value
+ *                                        assigned for interval option
+ *   -b, --fake-message-seq-at-begin      Test fake message sequence at the
+ *                                        beginning of the frame
+ *   -u, --disable-unhandled-report       Disable unhandled messages report as an
+ *                                        error in the log
+ *   -d, --disable-dialin-unhandled       Disable the Dialin messages logged as
+ *                                        unhandled
+ *   -q, --disable-timeout                Disables communication timeout
+ *   -a, --disable-alarm-no-minimize      Disables alarm no minimize
+ *   -S, --disable-sd-card-fail-log-stop  disable-sd-card-fail-log-stop
+ *   -C, --disable-cloudsync-fail-stop    disable-cloudsync-fail-stop
+ *   -k, --disable-check-in-log           Disables Check-In Log
+ *   -K, --disable-acknow-log             Disables Acknowledgment Log
+ *   -D, --enable-dry-demo                Enables Dry-Demo Mode
+ *   -A, --active-can-bus <CANBus>        Sets the Active CANBus [Shall start with
+ *                                        'can' or 'vcan]
+ *   -E, --enable-manufacturing           Enables the manufacturing mode to
+ *                                        configure the system for the first time.
+ *   -R, --use-root-home                  In case the application is not in
+ *                                        Manufacturing Setup but needs to use root
+ *                                        home folder for configurations.
+ *   -U, --enable-update-mode             Enables the update mode to update only
+ *                                        necessary files during the update and
+ *                                        keep the rest.
+ *   -x, --use-log-long-name              Use the log long file name format
+ *                                        <date>_<time>_<serial>_<mode>
+ *   -y, --use-log-cloud-upload           Use the log cloud upload
+ *   -z, --use-log-compression            Use the log compression
+ *   -L, --use-log-unhandled-only         Use the unhandled messages only to log
     """
     return " ".join(('leahi', *args))
 
@@ -180,22 +225,23 @@
     confirmButton = setObjectText(obj = names.o_preTreatmentStack_Text,text = config.CONFIRM )
     squish.mouseClick(squish.waitForObject(confirmButton))
     test.endSection()
-    
-def findAllObjectsById(parent, target_id):
+
+def findAllChildrenById(parent, target_id):
     """
-    Recursively finds all child objects by their id property.
-    Returns a list of all matching objects found.
+    Finds all child objects (excluding parent) by their id property.
+    Returns a list of all matching child objects found.
     """
     results = []
     
-    # Use hasattr to safely check for 'id' property
-    if hasattr(parent, 'id') and str(parent.id) == target_id:
-        results.append(parent)
-
-    # Recurse through all children to collect all instances
+    # Recurse through all children to collect matching instances
     for child in object.children(parent):
-        results.extend(findAllObjectsById(child, target_id))
-
+        # Check child's id 
+        if str(child.id) == target_id:
+            results.append(child)
+        
+        # Continue searching in grand children
+        results.extend(findAllChildrenById(child, target_id))
+    
     return results
  
 def set_value_with_slider(value_field_obj, slider_obj,parameter):
@@ -284,8 +330,6 @@
         test.fail("ERROR : " + error_message)
         return None
      
-        results.append(parent)
-
 def findAllObjectsByText(parent, target_text):
     """
     Recursively finds all child objects that have a 'text' property
Index: suite_leahi/tst_device_settings_information_version/test.py
===================================================================
diff -u -rca8a58fe0abeb3d18a1325d745005c373de81f22 -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/tst_device_settings_information_version/test.py	(.../test.py)	(revision ca8a58fe0abeb3d18a1325d745005c373de81f22)
+++ suite_leahi/tst_device_settings_information_version/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -31,18 +31,16 @@
     infromation_subscreen_menu_element = utility.get_object_from_names(
         names.o_DeviceSettingsInformation,
         error_message="Information menu element object missing",
-        timeout_ms=1000,
     )
     if infromation_subscreen_menu_element is not None:
         mouseClick(infromation_subscreen_menu_element)
     
     headerbar_container = utility.get_object_from_names(
         names.o_headerBar_HeaderBar,
         error_message="Information screen title text object missing",
-        timeout_ms=1000,
     )
     information_screen_title_text = utility.findChildByText(
-        headerbar_container, "Device Information"
+        headerbar_container, config.DEVICE_INFORMATION
     )
     if information_screen_title_text is not None:
         test.compare(
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(
Index: suite_leahi/tst_headerbar_information_popup/test.py
===================================================================
diff -u -rca8a58fe0abeb3d18a1325d745005c373de81f22 -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/tst_headerbar_information_popup/test.py	(.../test.py)	(revision ca8a58fe0abeb3d18a1325d745005c373de81f22)
+++ suite_leahi/tst_headerbar_information_popup/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -28,8 +28,7 @@
     Method to verify the parameter under 'Information Popup'
     """
     test.startSection("Verify the parameter under 'Information Popup '")
-    test.log("Navigating to 'Information Popup' screen")
-    mouseClick(waitForObjectExists(names.o_InformationIconButton))
+    mouseClick(waitForObjectExists(names.o_InformationIconButton, 3000))
 
     for info_parameter in config.INFORMATION_PARAMETERS:
         info_parameter_text = waitForObjectExists(
Index: suite_leahi/tst_headerbar_wifi_indicator/test.py
===================================================================
diff -u -rca8a58fe0abeb3d18a1325d745005c373de81f22 -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/tst_headerbar_wifi_indicator/test.py	(.../test.py)	(revision ca8a58fe0abeb3d18a1325d745005c373de81f22)
+++ 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
Index: suite_leahi/tst_service_export_logs/test.py
===================================================================
diff -u -r733e6e27c1d88e9615ab0d2ac422d8e5d87de89e -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/tst_service_export_logs/test.py	(.../test.py)	(revision 733e6e27c1d88e9615ab0d2ac422d8e5d87de89e)
+++ suite_leahi/tst_service_export_logs/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -44,14 +44,14 @@
 
 def navigate_to_export_logs():
     grid_container = utility.get_object_from_names(names.o_DeviceSettingsGrid)
-    export_logs_item = utility.findChildByText(grid_container, "Export Logs")
+    export_logs_item = utility.findChildByText(grid_container, config.EXPORT_LOGS)
 
     if export_logs_item is not None:
         mouseClick(export_logs_item)
     
     headerbar_container = utility.get_object_from_names(names.o_headerBar_HeaderBar, 2000)
     export_log_screen_title_text = utility.findChildByText(
-        headerbar_container, "Export Logs"
+        headerbar_container, config.EXPORT_LOG_TEXT
     )
     if export_log_screen_title_text is not None:
         test.compare(
Index: suite_leahi/tst_settings_service/test.py
===================================================================
diff -u -r4d3ce0eac45db33379f71308b11191ee2312f31b -rf7c5babf0cceeac7cacd155523b3fca43ac25a95
--- suite_leahi/tst_settings_service/test.py	(.../test.py)	(revision 4d3ce0eac45db33379f71308b11191ee2312f31b)
+++ suite_leahi/tst_settings_service/test.py	(.../test.py)	(revision f7c5babf0cceeac7cacd155523b3fca43ac25a95)
@@ -39,7 +39,7 @@
     test.startSection("Navigating to 'Manufacture Login' menu")
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar)
     service_screen_headerbar_title_text = utility.findChildByText(
-        headerbar_container, "Manufacturing Setup"
+        headerbar_container, config.MANUFACTURING_SCREEN_TITLE_TEXT
     )
     if service_screen_headerbar_title_text is not None:
         test.compare(
@@ -58,7 +58,7 @@
     container = waitForObject(names.o_UserConfirmation_SettingsServicePassword)
 
     # Find all TextInput objects that share the id "_input"
-    password_inputs = utility.findAllObjectsById(container, "_input")
+    password_inputs = utility.findAllChildrenById(container, "_input")
     
     # Use enumerate to track the index (0, 1, 2)
     for index, input_field in enumerate(password_inputs):
@@ -73,7 +73,6 @@
     confirm_button = utility.get_object_from_names(
         names.o_SettingsHome_confirmButton,
         "Error Missing Confirm Button",
-        2000
         )
     if confirm_button is not None:
         mouseClick(confirm_button)
@@ -98,7 +97,7 @@
     """
     
     container = waitForObject(names.o_UserConfirmation_SettingsServicePassword)
-    password_inputs = utility.findAllObjectsById(container, "_input")
+    password_inputs = utility.findAllChildrenById(container, "_input")
 
     for index, input_field in enumerate(password_inputs):
         # # Clear the field before typing a new value for the test case
@@ -125,14 +124,14 @@
     td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)
 
     grid_container = waitForObject(names.o_DeviceSettingsGrid)
-    service_option = utility.findChildByText(grid_container, "Service")
+    service_option = utility.findChildByText(grid_container, config.SERVICE)
 
     if service_option is not None:
         mouseClick(service_option)
 
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar)
     service_screen_headerbar_title_text = utility.findChildByText(
-        headerbar_container, "Service"
+        headerbar_container, config.SERVICE_SCREEN_TITLE_TEXT
     )
     if service_screen_headerbar_title_text is not None:
         test.compare(
@@ -149,14 +148,14 @@
     mouseClick(confirm_button)
 
     grid_container = waitForObject(names.o_DeviceSettingsGrid, 2000)
-    advanced_modes_option = utility.findChildByText(grid_container, "Advanced Mode")
+    advanced_modes_option = utility.findChildByText(grid_container, config.ADVANCED_MODE)
 
     if advanced_modes_option is not None:
         mouseClick(advanced_modes_option)
 
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar, 2000)
     advanced_modes_screen_headerbar_title_text = utility.findChildByText(
-        headerbar_container, "Advanced Mode"
+        headerbar_container, config.ADVANCED_MODES_SCREEN_TITLE_TEXT
     )
     if advanced_modes_screen_headerbar_title_text is not None:
         test.compare(
@@ -203,14 +202,14 @@
 def date_and_time_screen():
     test.startSection("Navigating to 'Date and Time' Screen and Verify Parameters")
     grid_container = waitForObject(names.o_DeviceSettingsGrid)
-    date_and_time_option = utility.findChildByText(grid_container, "Date and Time")
+    date_and_time_option = utility.findChildByText(grid_container, config.DATE_AND_TIME)
 
     if date_and_time_option is not None:
         mouseClick(date_and_time_option)
 
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar)
     date_and_time_screen_headerbar_title_text = utility.findChildByText(
-        headerbar_container, "Date and Time"
+        headerbar_container, config.DATE_AND_TIME_SCREEN_TITLE_TEXT
     )
     if date_and_time_screen_headerbar_title_text is not None:
         test.compare(
@@ -223,12 +222,12 @@
     grid_container = waitForObject(
         names.o_timeContainer_LabelUnitContainer
     )
-    date_and_time_option = utility.findChildByText(grid_container, "Time")
+    date_and_time_option = utility.findChildByText(grid_container, config.TIME)
 
     if date_and_time_option is not None:
         test.compare(
             date_and_time_option.text,
-            "Time",
+            config.TIME,
             "{} should be available in Date and Time Screen".format(
                 date_and_time_option.text
             ),
@@ -296,14 +295,14 @@
 def enable_root_ssh_screen():
     test.startSection("Navigating to 'Enable Root SSH' screen")
     grid_container = waitForObject(names.o_DeviceSettingsGrid)
-    enable_root_ssh_option = utility.findChildByText(grid_container, "Enable Root SSH")
+    enable_root_ssh_option = utility.findChildByText(grid_container, config.ENABLE_ROOT_SSH)
 
     if enable_root_ssh_option is not None:
         mouseClick(enable_root_ssh_option)
 
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar)
     enable_root_ssh_screen_headerbar_title_text = utility.findChildByText(
-        headerbar_container, "Enable Root SSH"
+        headerbar_container, config.ENABLE_ROOT_SSH_SCREEN_TITLE_TEXT
     )
     if enable_root_ssh_screen_headerbar_title_text is not None:
         test.compare(
@@ -397,14 +396,14 @@
 def factory_reset_screen():
     test.startSection("Navigating to 'Factory Reset' screen")
     grid_container = waitForObject(names.o_DeviceSettingsGrid)
-    factory_reset_option = utility.findChildByText(grid_container, "Factory Reset")
+    factory_reset_option = utility.findChildByText(grid_container, config.FACTORY_RESET)
 
     if factory_reset_option is not None:
         mouseClick(factory_reset_option)
 
     headerbar_container = waitForObject(names.o_headerBar_HeaderBar)
     factory_reset_screen_headerbar_title_text = utility.findChildByText(
-        headerbar_container, "Factory Reset"
+        headerbar_container, config.FACTORY_RESET_SCREEN_TITLE_TEXT
     )
     if factory_reset_screen_headerbar_title_text is not None:
         test.compare(
@@ -419,7 +418,7 @@
         names.o_userConfirmation_SettingsFactoryReset
     )
     factory_reset_screen_text = utility.findChildByText(
-        factory_reset_container, "Do you want to perform the factory reset?"
+        factory_reset_container, config.FACTORY_RESET_SCREEN_TEXT
     )
     if factory_reset_screen_text is not None:
         test.compare(
@@ -446,9 +445,8 @@
     login_page_title_text = utility.get_object_from_names(
         names.o_loginPage_Titletext,
         error_message="Login Page Title text not found",
-        timeout_ms=2000,
     )
-    if login_page_title_text.text == 'Set Password':
+    if login_page_title_text.text == config.SET_PASSWORD:
         manufacture_login()
     else:
         closeWindow(names.o_Gui_MainView)