Index: suite_leahi/tst_patient_vitals/test.py
===================================================================
diff -u -rd821a29980219bd4228d724160ac1c353b3407b2 -r0cdd38332d8817480e55fc202f9b01e311e97c43
--- suite_leahi/tst_patient_vitals/test.py	(.../test.py)	(revision d821a29980219bd4228d724160ac1c353b3407b2)
+++ suite_leahi/tst_patient_vitals/test.py	(.../test.py)	(revision 0cdd38332d8817480e55fc202f9b01e311e97c43)
@@ -61,8 +61,11 @@
 
 def verify_create_treatment_parameters():
     test.startSection("Pre treatment parameters")
-    mouseClick(waitForObject(names.o_PatientIDEntry_TextEntry))
-    waitForObject(names.o_PatientIDEntry_TextEntry).text ="abcd"
+    for i in range(4):
+        mouseClick(waitForObject(names.o_preTreatmentStack_confirmButton_ConfirmButton))
+    
+    mouseClick(waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry))
+    waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="abcd"
     utility.set_value_based_on_target(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 90)
     utility.set_value_based_on_target(names.o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster, 100)
     utility.set_value_based_on_target(names.o_PreTreatmentCreate_durationControl_ValueAdjuster, 105)
@@ -75,7 +78,7 @@
     utility.set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 100)
     utility.select_different_dropdown(names.o_PreTreatment_vitalsCombobox_BaseCombobox,VITALS,1)
     utility.select_different_dropdown(names.o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox,BICARBONATE,0)
-    mouseClick(waitForObject(names.o_PreTreatmentButtom))
+    mouseClick(waitForObject(names.o_preTreatmentStack_confirmButton_ConfirmButton))
     td.td_Treatment_Parameters_Validation(  vAccepted                                    = 1,
                                             vBloodFlowRateRejectReason                   = 0,
                                             vDialysateFlowRateRejectReason               = 0,
@@ -92,13 +95,13 @@
                                             vArterialPressureLimitWindowRejectReason     = 0,
                                             vVenousPressureLimitWindowRejectReason       = 0,
                                             vVenousPressureLimitAsymtrcRejectReason      = 0,
-                                            vTrancembrncPressureLimitWindowRejectReason  = 0,
+                                            vTransmembranePressureLimitWindowRejectReason= 0,
                                             vDialysateTempRejectReason                   = 0,
                                             vHeparinDispensingRateRejectReason           = 0,
                                             vHeparinBolusVolumeRejectReason              = 0
                                            )
     
-    confirmButton = waitForObject(names.o_PreTreatmentButtom)
+    confirmButton = waitForObject(names.o_preTreatmentStack_confirmButton_ConfirmButton)
     mouseClick(waitForObject(confirmButton))
     td.td_operation_mode(TDOpModes.MODE_PRET.value, 0)
     test.endSection()
@@ -213,13 +216,14 @@
     # mouseClick(waitForObject(names.o_treatmentHome_editButton_IconButton))
     test.startSection("Verify popup is opened automatically after time interval")      
     mouseClick(waitForObject(names.o_vitalsButton_VitalsButton))
-    mouseClick(names.o_measureVitalsButton_TouchRect)
-    test.verify(waitFor("'vitalsrequest == True'", 1000), "UI Sending the request to FW")
+    # mouseClick(names.o_measureVitalsButton_TouchRect)
+    
     td.td_vitals( systolic    = 70, 
                 diastolic   = 50, 
                 heartRate   = 120 )
     td.td_vitals_adjustment_response(vRejectionReason=1)
     verify_vitals_pop_up_is_opened_automatically_after_an_interval(interval=5)
+    test.verify(waitFor("'vitalsrequest == True'", 1000), "UI Sending the request to FW")
     test.endSection()
                 
 def validate_time_interval(vital_interval_obj, int_min):
@@ -287,13 +291,14 @@
     MAX_WAIT = 5 * 60   # 5 minutes in seconds
     POLL_INTERVAL = 5  # check every 5 seconds
  
-    
     mouseClick(waitForObject(names.o_vitalsButton_VitalsButton))
     mouseClick(names.o_measureVitalsButton_TouchRect)
-    test.verify(waitFor("'vitalsrequest == True'", 1000), "UI Sending the request to FW")
     td.td_vitals( systolic    = 70, 
                 diastolic   = 50, 
                 heartRate   = 120 )
+    
+    test.verify(waitFor("'vitalsrequest == True'", 1000), "UI Sending the request to FW")
+    
     td.td_vitals_adjustment_response(vRejectionReason=0)
     start_time = time.time()
  
@@ -328,7 +333,9 @@
     # verify Standby screen
     test.verify(waitForObjectExists(names.o_standByScreen_MainHome), "In Standby")
     mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect))
-    td.td_operation_mode(TDOpModes.MODE_TPAR.value, 0)
+    td.td_operation_mode(TDOpModes.MODE_PRET.value, 0)
+    td.td_blood_set_auto_load_response(vRejectionReason = 0)
+    
     test.startSection("Create the pretreatment values")
     verify_create_treatment_parameters()
     test.endSection()