Index: suite_leahi/shared/scripts/configuration/config.py
===================================================================
diff -u -r29b13ab71d918d768cabc78211bb586d947d0908 -rcaf00bfc54e6f76c3c6e5f30950c6507ea13af9a
--- suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision 29b13ab71d918d768cabc78211bb586d947d0908)
+++ suite_leahi/shared/scripts/configuration/config.py	(.../config.py)	(revision caf00bfc54e6f76c3c6e5f30950c6507ea13af9a)
@@ -1,10 +1,3 @@
-#  -S, --disable-sd-card-fail-log-stop  disable-sd-card-fail-log-stop
-#  -k, --enable-check-in-log            Enables Check-In Log
-#  -K, --enable-acknow-log              Enables Acknowledgment Log
-
-AUT_NAME = "leahi -k -K -S -q"
-AUT_NAME_ONLY = "leahi" # Need only the AUT name for tst_ui_logs, do not add options
-
 # Configuration application_init.py
 TMP_DIR = "/tmp/"
 APP_POST_LOG_LOCATION = "".join([str(TMP_DIR),'/post.log'])
Index: suite_leahi/tst_settings_service/test.py
===================================================================
diff -u -r29b13ab71d918d768cabc78211bb586d947d0908 -rcaf00bfc54e6f76c3c6e5f30950c6507ea13af9a
--- suite_leahi/tst_settings_service/test.py	(.../test.py)	(revision 29b13ab71d918d768cabc78211bb586d947d0908)
+++ suite_leahi/tst_settings_service/test.py	(.../test.py)	(revision caf00bfc54e6f76c3c6e5f30950c6507ea13af9a)
@@ -9,8 +9,8 @@
 #    3 Update Password to Default Manufacture Password
 #    4 Start Leahi Application and simulate TD standby mode and navigate to the Device Settings screen 
 #    then Simulate TD Service mode, navigate to the Screen screen and Compare Service Screen title and 
-#    Enter Password and Click confirm Then Navigate to User Mode Screen and 
-#    Toggle the user mode, Verify Switch state and Click Back Button
+#    Enter Password and Click confirm Then Navigate to Advanced Mode Screen and 
+#    Toggle the Advanced mode, Verify Switch state and Click Back Button
 #    5 Navigate to Date and Time Screen and verify and compare Title bar text
 #    And Verify the parameter under Date and Time screen, Toggle the NTP mode switch
 #    Button and Verify Switch state, Click Back Button
@@ -197,9 +197,11 @@
     )
 
     mouseClick(names.o_SettingsBase_backButton_AdvancedMode)
+    test.endSection()
 
 
 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")
 
@@ -280,6 +282,7 @@
     )
 
     mouseClick(names.o_SettingsBase_backButton_NTP_Switch)
+    test.endSection()
 
 
 def verify_root_login_button_state(expected_state, message):
@@ -291,6 +294,7 @@
 
 
 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")
 
@@ -387,9 +391,11 @@
     )
     
     mouseClick(names.o_SettingsBase_backButton_RootSSH)
+    test.endSection()
 
 
 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")
 
@@ -449,7 +455,7 @@
         
     application_init.update_password_back_to_default_password()
     
-    startApplication(config.AUT_NAME)
+    startApplication(utility.aut("leahi"))
     service_login()
     date_and_time_screen()
     enable_root_ssh_screen()