Index: tst_environment/test.py
===================================================================
diff -u -r8df6f936193bbd9127d3ec940562e62db0060bcb -r976c0889b00ab12a0eb73d9f2fa97db18f1efaa2
--- tst_environment/test.py	(.../test.py)	(revision 8df6f936193bbd9127d3ec940562e62db0060bcb)
+++ tst_environment/test.py	(.../test.py)	(revision 976c0889b00ab12a0eb73d9f2fa97db18f1efaa2)
@@ -14,14 +14,15 @@
 
 import names
 
+from configuration import config
 from dialin.ui import utils
 from dialin.ui import unittests
 
 def main():
     utils.tstStart(__file__)
 
     try:    
-        startApplication(names.AUT_NAME)
+        startApplication(config.AUT_NAME)
         test.passes("start application")
     except RuntimeError as err:
         test.fail(str(err))
Index: tst_main_treatment_vitals/test.py
===================================================================
diff -u -r0ace1db5298cbd423b8ac5194ffa3e3fda7963a4 -r976c0889b00ab12a0eb73d9f2fa97db18f1efaa2
--- tst_main_treatment_vitals/test.py	(.../test.py)	(revision 0ace1db5298cbd423b8ac5194ffa3e3fda7963a4)
+++ tst_main_treatment_vitals/test.py	(.../test.py)	(revision 976c0889b00ab12a0eb73d9f2fa97db18f1efaa2)
@@ -101,7 +101,7 @@
 def verify_last_read_time(saved_time):
     """
         method to verify the last read of blood pressure and heart rate
-        @param last_read: (str) time of saving blood pressure and heart rate
+        @param saved_time: (str) time of saving blood pressure and heart rate
     """
     test.startSection("Verify the last read of blood pressure and heart rate")
     expected_last_read = "Interval: 30min , Last Read: {}".format(saved_time)
@@ -125,7 +125,7 @@
         value = str(value)
         test.compare(str(entered_value), value, 
             "Expected {} value: {} should be equal to Actual {} value: {}".format(vital, value, vital, entered_value))
-    elif (save is False):
+    else:
         if object.exists(vitals_reading_obj(value)) is False:
             test.log("Entered is not saved and is not updated in main-treatment screen")
    
@@ -142,6 +142,7 @@
     test.startSection("Verify the user entered {} value {}".format(vital, value))
     input_field = waitForObject(input_field)
     entered_value = str(input_field.text)
+    utils.waitForGUI(1)
     test.compare(entered_value, value, 
             "Actual {} value: {} should be equal to Expected {} value: {}".format(vital, entered_value, vital, value))
     test.endSection()
@@ -176,6 +177,7 @@
             verify_color_of_entry(entry=value, vital_parameter=DIASTOLIC_TEXT, 
                                     input_field=diastolic)
             erase_entered_value(diastolic)
+            utils.waitForGUI(1)
     elif vital_parameter is HEART_RATE_TITLE:
         hr = waitForObject(names.o_pop_up_heart_rate_input_field)
         mouseClick(hr)
@@ -216,6 +218,7 @@
             verify_color_of_entry(entry=entry, vital_parameter=DIASTOLIC_TEXT, 
                                         input_field=diastolic)
             erase_entered_value(diastolic)
+            utils.waitForGUI(1)
     elif vital_parameter is HEART_RATE_TITLE:
         hr = waitForObject(names.o_pop_up_heart_rate_input_field)
         mouseClick(hr)
@@ -252,6 +255,7 @@
     diastolic = waitForObject(names.o_pop_up_diastolic_input_field)
     mouseClick(diastolic)
     erase_entered_value(diastolic)
+    utils.waitForGUI(1)
     enter_keypad_value(str(dia_val))
     verify_entered_value_in_pop_up(value=str(dia_val), input_field=diastolic,
                                     vital=DIASTOLIC_TEXT)