Index: suite_leahi/tst_feature_options/test.py
===================================================================
diff -u -r6078061ad1c24e3ad4873a1a64f3bb4fcfd3e2eb -r357ec7974976aba05284ecc1cc4afcda6d1a5293
--- suite_leahi/tst_feature_options/test.py	(.../test.py)	(revision 6078061ad1c24e3ad4873a1a64f3bb4fcfd3e2eb)
+++ suite_leahi/tst_feature_options/test.py	(.../test.py)	(revision 357ec7974976aba05284ecc1cc4afcda6d1a5293)
@@ -130,7 +130,12 @@
     mouseClick(waitForObjectExists(names.o_vitalsPopup_Close_Image, 2000))
 
     td_simulator.td_operation_mode(TDOpModes.MODE_INIT.value)
-    td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)
+    td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0)
+    headerbar_container = waitForObject(names.o_mainMenu_MainMenu, 3000)
+    mouseClick(utility.findChildByText(headerbar_container, config.SETTINGS))
+
+    td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)    
+    device_settings_grid = waitForObject(names.o_DeviceSettingsGrid, 3000)
     mouseClick(utility.findChildByText(device_settings_grid, config.FEATURE_CONFIGURATIONS))
 
     # Wait for the toggle Integrated BP Cuff switch object
@@ -184,12 +189,10 @@
     headerbar_container = waitForObject(names.o_mainMenu_MainMenu, 3000)
     mouseClick(utility.findChildByText(headerbar_container, config.SETTINGS))
 
-        
     td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)    
     device_settings_grid = waitForObject(names.o_DeviceSettingsGrid, 3000)
     mouseClick(utility.findChildByText(device_settings_grid, config.FEATURE_CONFIGURATIONS))
 
-
     # Wait for the toggle Heparin Syringe Pump switch object
     heparin_syringe_pump_mode_switch = waitForObject(
         names.o_SettingsBase_heparinSyringePumpSwitch_BaseSwitch, 3000
@@ -256,8 +259,12 @@
     test.verify(heparin_bar.visible, "Verify Heparin Bar in HearderBar is Visible")
 
     td_simulator.td_operation_mode(TDOpModes.MODE_INIT.value)
-    td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)
+    td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value, 0)
+    headerbar_container = waitForObject(names.o_mainMenu_MainMenu, 3000)
+    mouseClick(utility.findChildByText(headerbar_container, config.SETTINGS))
 
+    td_simulator.td_operation_mode(TDOpModes.MODE_SERV.value, 0)    
+    device_settings_grid = waitForObject(names.o_DeviceSettingsGrid, 3000)
     mouseClick(utility.findChildByText(device_settings_grid, config.FEATURE_CONFIGURATIONS))
 
     # Wait for the toggle Heparin Syringe Pump switch object