Index: suite_leahi/shared/scripts/configuration/config.py
===================================================================
diff -u -r6078061ad1c24e3ad4873a1a64f3bb4fcfd3e2eb -rc697407b30310eda41d59fe98cd42aa461038516
--- suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision 6078061ad1c24e3ad4873a1a64f3bb4fcfd3e2eb)
+++ suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision c697407b30310eda41d59fe98cd42aa461038516)
@@ -85,15 +85,32 @@
 ACTIVE          = 'Active'
 RESUME          = 'Resume'
 COMPLETE        = 'Complete'
-HEPARIN         = "Heparin"
-CREATERX        = "Rx"
-VALIDATE        = "Validate"
-CONFIRM         = "Confirm"
-NEXT            ="Next"
+HEPARIN         = 'Heparin'
+CREATERX        = 'Rx'
+VALIDATE        = 'VALIDATE'
+CONFIRM         = 'CONFIRM'
+NEXT            = 'Next'
+AUTO_LOAD       = 'Auto Load'
+WATER_SAMPLE    = 'Water Sample'
+START           = 'Start'
+AUTO_EJECT      = 'Auto Eject'
 
 # Settings Service
 DEFAULT_SERVICE_PASSWORD_RAW = "Atal.Matal.22leh" # TODO need to update if we ever change the default
+NEW_PASSWORD_RAW = "Test4.Ksah.sk43sa"
+MANUFACTURING_SCREEN_TITLE_TEXT = "Manufacturing Setup"
+SERVICE_SCREEN_TITLE_TEXT = "Service"
+ADVANCED_MODES_SCREEN_TITLE_TEXT = "Advanced Mode"
+DATE_AND_TIME_SCREEN_TITLE_TEXT = "Date and 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?"
 
+#Blood Set Auto Load
+BLOOD_SET_AUTO_LOAD_REJECTION = "[1] Request is not allowed in the current operating mode"
+BLOOD_SET_AUTO_EJECT_REJECTION = "[1] Request is not allowed in the current operating mode"
 #Feature Options
 FEATURE_CONFIGURATIONS_SCREEN_TITLE_TEXT = "Feature Configurations"
 FEATURE_CONFIGURATIONS_PARAMETERS_TEXTS = ["Integrated BP Cuff", "Heparin Syringe Pump", "Chemical Disinfection"]
@@ -120,3 +137,65 @@
 PRESCRIPTIONS = "Prescriptions"
 TREATMENT = "Treatment"
 SETTINGS = "Settings"
+
+# Pre-Treatment Foundation
+CONCENTRATES_PAGE_TITLE = "Connect Acid and Bicarbonate Concentrates"
+CONCENTRATES_PAGE_CONTENTS = [
+    "Remove acid connector and connect to acid concentrate.",
+    "Connect dry bicarbonate.",
+]
+INSTALLATION_STEPPER_1_PAGE_TITLE = "Install Blood Tubing Set"
+INSTALL_BLOOD_TUBING_SET_CONTENTS = [
+    "Open the blood pump door.",
+    "Insert blood tubing set and ensure it is secure.",
+    "Push the blood tube into the blood pump.",
+    "Close the blood pump door.",
+]
+INSTALLATION_STEPPER_2_PAGE_TITLE = "Install Bloodlines"
+INSTALL_BLOODLINES_CONTENTS = [
+    "Insert saline line into the first slot.",
+    "Insert arterial line into the second slot.",
+    "Ensure the venous line is placed in the bubble detector.",
+    "Insert the venous line into the third slot.",
+    "Connect the arterial and venous bloodlines using the recirculation connector.",
+]
+INSTALLATION_STEPPER_3_PAGE_TITLE = "Install Pressure Lines and Dialyzer"
+INSTALL_PRESSURE_LINES_CONTENTS = [
+    "Connect the arterial pressure line to the arterial pressure transducer port.",
+    "Connect the venous pressure line to the venous pressure transducer port.",
+    "Insert dialyzer into the holder and connect the dialysate lines.",
+    "Connect the bloodlines to the dialyzer.",
+    "Clamp the venous chamber line.",
+    "Clamp the heparin line.",
+]
+SELF_TESTS_PAGE_CONTENTS = [
+    "Auto-Load Blood Tubing",
+    "Cartridge Install Checks",
+    "Pressure Leak Check",
+]
+SALINE_PAGE_TITLE = "Connect Saline Bag"
+SALINE_PAGE_CONTENTS = [
+    "Hang saline bag on the hook.",
+    "Clamp saline line.",
+    "Use the saline line to spike saline bag.",
+    "Unclamp saline line.",
+]
+PRIME_PAGE_CONTENTS = ["Blood Tubing Circuit Priming", "Dialysate Circuit Priming"]
+CONNECT_PAGE_TITLE = "Connect Bloodlines to the Patient"
+CONNECT_PAGE_CONTENTS = [
+    "Clamp arterial and venous bloodlines (2 clamps).",
+    "Remove recirculation connector from the bloodlines.",
+    "Connect bloodlines to patient access lines.",
+    "Unclamp arterial and venous bloodlines (2 clamps).",
+]
+DISCONNECT_PAGE_TITLE = "Remove Concentrates and Blood Tubing Set"
+DISCONNECT_PAGE_CONTENTS = [
+    "Remove blood tubing set and dialyzer.",
+    "Remove acid and bicarbonate concentrates.",
+]
+INSTALLATION_PAGE_TITLE = "Install Concentrates and Blood Tubing Set"
+INSTALLATION_PAGE_CONTENTS = [
+    "Install acid and bicarbonate concentrates.",
+    "Install blood tubing set and dialyzer.",
+]
+START_TREATMENT_REJECTION_NOTIFICATION = "[1] Request is not allowed in the current operating mode"
\ No newline at end of file
Index: suite_leahi/shared/scripts/configuration/utility.py
===================================================================
diff -u -r8ac0eae52c22298abedaec3200ebd450888c3ac2 -rc697407b30310eda41d59fe98cd42aa461038516
--- suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision 8ac0eae52c22298abedaec3200ebd450888c3ac2)
+++ suite_leahi/shared/scripts/configuration/utility.py	(.../utility.py)	(revision c697407b30310eda41d59fe98cd42aa461038516)
@@ -3,21 +3,67 @@
 import object
 import names
 from leahi_dialin.ui.td_messaging import TD_Messaging
-from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates
-from configuration import config, navigation
-from leahi_dialin.ui import utils
-from builtins import int as pyInt
+from leahi_dialin.common.td_defs  import TDOpModes,TDTreatmentStates
+from configuration                import config, navigation
+from leahi_dialin.ui              import utils
+from builtins                     import int as pyInt
 
-td = TD_Messaging()
+td =TD_Messaging()
 
 def aut(*args):
     """
     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))
+
    
-def get_object_from_names(names_dict, error_message = "Missing object", timeout_ms = 200):
+def get_object_from_names(names_dict, error_message = "Missing object", timeout_ms = 3000):
     """
         To get an object with try..except catching to prevent script errors when the object is not found on the GUI
         @param names_dict - the dictionary element from the names.py file (ie: names.some_variable_name_of_element)
@@ -27,7 +73,7 @@
         return squish.waitForObject(names_dict, timeout_ms)
     except LookupError:
         test.fail("ERROR : " + error_message)
-        return None 
+        return None
     
 def get_bullet_object(screen_obj, num):
     """
@@ -50,7 +96,7 @@
     names.o_text_object["text"] = txt
     return names.o_text_object
     
-def setObjectText(text,obj):
+def setObjectText(obj,text):
     """
         Method to set object property based on text
         @param text : (string) treatment parameter text
Index: suite_leahi/shared/scripts/names.py
===================================================================
diff -u -r8ac0eae52c22298abedaec3200ebd450888c3ac2 -rc697407b30310eda41d59fe98cd42aa461038516
--- suite_leahi/shared/scripts/names.py	(.../names.py)	(revision 8ac0eae52c22298abedaec3200ebd450888c3ac2)
+++ suite_leahi/shared/scripts/names.py	(.../names.py)	(revision c697407b30310eda41d59fe98cd42aa461038516)
@@ -6,6 +6,9 @@
 o_Gui_MainView                                                  = {                                                                                                                                                                                                                                                 "type": "Gui::MainView",                                            "unnamed": 1          }     
 o_QQuickView                                                    = {                                                                                                                                                                                                                                                 "type": "QQuickView"                                                                      }     
 o_Overlay                                                       = {"container": o_QQuickView,                                                                                                                                                                                                                       "type": "Overlay"                                                                         }     
+o_mainMenu_MainMenu                                             = {"container": o_Gui_MainView,                                                          "id": "_mainMenu",                                                                                                                                         "type": "MainMenu",                                                 "unnamed": 1          }
+o_headerBar_HeaderBar                                           = {"container": o_Gui_MainView,                                                          "id": "_headerBar",                                                                                                                                        "type": "HeaderBar",                                                "unnamed": 1          }
+   
                                                                                                                                                                                                                                                                                                         
 # Solution Infusion                                                                                                                                                                                                                                                                                                                                                                         
 o_standByScreen_MainHome                                        = {"container": o_Gui_MainView,                                                                                                                                                                                                                     "type": "MainHome"                                                                       }
@@ -38,6 +41,18 @@
 o_dialyste_cond_title_Text                                      = {"container": mainTreatmentScreen,                                                     "id": "_dialysateCond",                                               "objectName": "dialysateCondComponent",                                               "type": "TreatmentFlowsComponent"                                                        }
 o_treatmentTimeNotificationBarSmall                             = {"container": mainTreatmentScreen,                                                                                                                           "objectName": "notification",                                                         "type": "NotificationBarSmall"                                                           }
                                                                                                                                                                                                                                                                                                                         
+# settings_service_export_logs 
+o_SettingsHome                                                  = {"container": o_Gui_MainView,                                                                                                                            "objectName": "_SettingsHome",                                                       "type": "SettingsHome",                                                                     }
+o_SettingsExportLogs                                            = {"container": o_Gui_MainView,                                                                                                                            "objectName": "_SettingsBase",                                                       "type": "SettingsExportLogs",                                                               }
+o_SettingsInformation                                           = {"container": o_Gui_MainView,                                                                                                                            "objectName": "_SettingsBase",                                                       "type": "SettingsBase",                                                                     }
+o_USBEjectButton                                                = {"container": o_SettingsExportLogs,                                                    "id": "_usbEjectButton",                                                                                                                               "type": "USBButton",                                                 "unnamed": 1           }
+o_LogTypeComboBox                                               = {"container": o_SettingsInformation,                                                   "id": "_logTypeCombo",                                                                                                                                 "type": "ComboBox",                                                  "unnamed": 1           }
+o_OptionComboBox                                                = {"container": o_Overlay,                                                                                                                                                                                                                      "type": "Text",                                                      "unnamed": 1           }
+o_ExportButton                                                  = {"container": o_SettingsExportLogs,                                                    "id": "_logTypeExportButton",                                                                                                                          "type": "ExportButton",                                              "unnamed": 1           }
+o_ExportLogsProgressRect                                        = {"container": o_SettingsExportLogs,                                                    "id": "_progressRect",                                                                                                                                 "type": "ProgressRect",                                              "unnamed": 1           }
+o_ExportLogsNotificationBar                                     = {"container": o_SettingsExportLogs,                                                    "id": "_information",                                                                                                                                  "type": "NotificationBarSmall",                                                             }
+o_DeviceSettingsGrid                                            = {"container": o_SettingsHome,                                                          "id": "_grid",                                                                                                                                         "type": "Grid",                                                                             }
+                                                                                                                                                                                                                                                                                                                         
 # settings_service_export_logs                                                                                                                                                                                                                                                                                                                                                                      
 o_mainMenu_MainMenu                                             = {"container": o_Gui_MainView,                                                          "id": "_mainMenu",                                                                                                                                     "type": "MainMenu",                                                   "unnamed": 1        }
 o_headerBar_HeaderBar                                           = {"container": o_Gui_MainView,                                                          "id": "_headerBar",                                                                                                                                    "type": "HeaderBar",                                                  "unnamed": 1        }
@@ -196,8 +211,7 @@
 o_preTreatmentStack_PreTreatmentStack                           = {"container": o_Gui_MainView,                                                          "id": "_preTreatmentStack",                                                                                                                            "type": "PreTreatmentStack",                                         "unnamed": 1           }
 o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase           = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                  "objectName": "_PreTreatmentBase",                                                      "type": "PreTreatmentBase"                                                                  }
 o_PreTreatmentBase_instructionView_InstructionView              = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase,                   "id": "_instructionView",                                                                                                                              "type": "InstructionView",                                           "unnamed": 1           }
-                                                                                                                                                
-                                                                                                                                                
+                                                                                                                                                                                                                                                                                            
 #Heparin                            
 o_listView_Item                                                 = {"container": o_Gui_MainView,                                                                                                                                                                                                                 "type": "Item",                                                      "unnamed": 1           }
 o_treatmentHeparin_TreatmentHeparin                             = {"container": o_Gui_MainView,                                                          "id": "_treatmentHeparin",                                                                                                                             "type": "TreatmentHeparin",                                          "unnamed": 1           }
@@ -231,11 +245,24 @@
 o_UserConfirmation_SettingsServicePassword                      = {"container": o_SettingsStack_SettingsStack,                                                                                                              "objectName": "UserConfirmation",                                                   "type": "SettingsServicePassword",                                                           }
 o_userConfirmation_TextInput                                    = {"container": o_UserConfirmation_SettingsServicePassword,               "echoMode": 2, "id": "_input", "passwordCharacter": "•",                                                                                                              "type": "TextInput",                                                  "unnamed": 1,          }
 o_userConfirmation_ConfirmButton                                = {"container": o_UserConfirmation_SettingsServicePassword,                                                                                                 "objectName": "_confirmButton",                                                     "type": "ConfirmButton",                                                                     }
-
 #Helpers
-o_PreTreatmentSampleStack_PreTreatmentWaterSample               = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                      "objectName": "_PreTreatmentSampleStack",                                           "type": "PreTreatmentWaterSample",                                                           }
-o_PreTreatmentSampleStack_button_TouchRect                      = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample,                       "id": "_button",                                                                                                                                       "type": "TouchRect",                                                  "unnamed": 1           }
-o_preTreatmentStack_repeater_Repeater                           = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "repeater",                                                                                                                                      "type": "Repeater",                                                   "unnamed": 1           }
+o_SettingsStack_SettingsStack                                   = {"container": o_Gui_MainView,                                                                                                                            "objectName": "_SettingsStack",                                                      "type": "SettingsStack",                                                                    }
+o_UserConfirmation_SettingsServicePassword                      = {"container": o_SettingsStack_SettingsStack,                                                                                                             "objectName": "UserConfirmation",                                                    "type": "SettingsServicePassword",                                                          }
+o_loginPage_Titletext                                           = {"container": o_UserConfirmation_SettingsServicePassword,                              "id":"_titleText",                                                                                                                                     "type": "Text",                                                      "unnamed": 1           }
+o_userConfirmation_TextInput                                    = {"container": o_UserConfirmation_SettingsServicePassword,                              "id": "_input",                                                                                                                                        "type": "TextInput",                                                 "unnamed": 1           }
+o_userConfirmation_ConfirmButton                                = {"container": o_UserConfirmation_SettingsServicePassword,                                                                                                "objectName": "_confirmButton",                                                      "type": "ConfirmButton",                                                                    }
+o_PreTreatmentSampleStack_PreTreatmentWaterSample               = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                      "objectName": "_PreTreatmentSampleStack",                                           "type": "PreTreatmentWaterSample",                                                          }
+o_PreTreatmentSampleStack_button_TouchRect                      = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample,                       "id": "_button",                                                                                                                                       "type": "TouchRect",                                                 "unnamed": 1           }
+o_preTreatmentStack_repeater_Repeater                           = {"container": o_preTreatmentStack_PreTreatmentStack,                                   "id": "repeater",                                                                                                                                      "type": "Repeater",                                                  "unnamed": 1           }
+o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate,          "id": "_bpMeasurementIntervalControl",                                                                                                                 "type": "ValueAdjusterCustom",                                       "unnamed": 1           }
+o_preTreatmentStack_confirmButton_ConfirmButton                 = {"container": o_preTreatmentStack_PreTreatmentStack,                                                                                                      "objectName": "_confirmButton",                                                     "type": "ConfirmButton",                                             "visible": True        }
+o_PostTreatmentStack_PostTreatmentStack                         = {"container": o_Gui_MainView,                                                                                                                             "objectName": "_PostTreatmentStack",                                                "type": "PostTreatmentStack",                                                               }
+o_SettingsBase_SettingsAdvancedMode                             = {"container": o_Gui_MainView,                                                                                                                            "objectName": "_SettingsBase",                                                       "type": "SettingsAdvancedMode",                                                             }
+o_settingsAdvancedMode_BaseSwitch                               = {"container": o_SettingsBase_SettingsAdvancedMode,                                     "id": "_settingsAdvancedMode",                                                                                                                         "type": "BaseSwitch",                                                "unnamed": 1           }
+o_SettingsBase_backButton_AdvancedMode                          = {"container": o_SettingsBase_SettingsAdvancedMode,                                                                                                       "objectName": "_backButton",                                                         "type": "BackButton",                                                                       }
+o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack= {"container": o_preTreatmentStack_PreTreatmentStack,                              "id": "_pretreatmentInstallation",                                                                                                                     "type": "PreTreatmentInstallStack",                                  "unnamed": 1           }
+o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase    = {"container": o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack,                                                                     "objectName": "_PreTreatmentBase",                                                   "type": "PreTreatmentBase",                                                                 }
+o_pretreatmentInstallation_instructionView_InstructionView      = {"container": o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase,            "id": "_instructionView",                                                                                                                              "type": "InstructionView",                                           "unnamed": 1           }
 
 # Feature Options
 o_SettingsBase_SettingsFeatureConfigurations                    = {"container": o_Gui_MainView,                                                                                                                             "objectName": "_SettingsBase",                                                      "type": "SettingsFeatureConfigurations",                                                     }
Index: suite_leahi/suite.conf
===================================================================
diff -u -rdbffda9f80a36a607e84643c8ed2c0e387bd49f9 -rc697407b30310eda41d59fe98cd42aa461038516
--- suite_leahi/suite.conf	(.../suite.conf)	(revision dbffda9f80a36a607e84643c8ed2c0e387bd49f9)
+++ suite_leahi/suite.conf	(.../suite.conf)	(revision c697407b30310eda41d59fe98cd42aa461038516)
@@ -1,6 +1,6 @@
 AUT=leahi
 LANGUAGE=Python
 OBJECTMAPSTYLE=script
-TEST_CASES=tst_feature_options
+TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_pre_treatment_foundation tst_feature_options
 VERSION=3
 WRAPPERS=Qt