Index: tst_settings_date_and_time/test.py
===================================================================
diff -u -r1620a2c311b44e84f3ddd30f315e77e51de6e5e6 -ra988dd9b14a5d9a247b8eb25980ca577880160ca
--- tst_settings_date_and_time/test.py	(.../test.py)	(revision 1620a2c311b44e84f3ddd30f315e77e51de6e5e6)
+++ tst_settings_date_and_time/test.py	(.../test.py)	(revision a988dd9b14a5d9a247b8eb25980ca577880160ca)
@@ -266,17 +266,15 @@
         if(entry==1 or entry==3 or entry==5 or entry==7 or entry==8 or entry==10 or entry==12):
             day_upper_limit = DAY_UPPER_LIMIT
             test.log("Number of days is " + str(day_upper_limit))
-        elif(entry==2):
-            day_upper_limit = DAY_UPPER_LIMIT - 3
-            test.log("Number of days is " + str(day_upper_limit))
-        elif(entry==2 and isleap(builtins.int(year))):
-            day_upper_limit = DAY_UPPER_LIMIT - 2
-            test.log("Number of days is " + str(day_upper_limit))    
         elif(entry==4 or entry==6 or entry==9 or entry==11):
             day_upper_limit = DAY_UPPER_LIMIT - 1
             test.log("Number of days is " + str(day_upper_limit))
-        else:
-            test.fail("Invalid Month")    
+        if(entry==2 and isleap(date_time_parameter is YEAR_TEXT)):
+            day_upper_limit = DAY_UPPER_LIMIT - 2
+            test.log("Number of days is " + str(day_upper_limit))
+        elif(entry==2):
+            day_upper_limit = DAY_UPPER_LIMIT - 3
+            test.log("Number of days is " + str(day_upper_limit))        
         if (entry < MONTH_LOWER_LIMIT) or (entry > MONTH_UPPER_LIMIT):
             test.compare(actual_value, entry, "{} value {} should be equal to {}".format(date_time_parameter, actual_value, entry))
             test.compare(input_field_color, config.OUT_OF_RANGE_COLOR, "Month value {} is out of range, Month value should be in range of {} and {}".format(entry, MONTH_LOWER_LIMIT, MONTH_UPPER_LIMIT))
@@ -316,11 +314,11 @@
     navigate_to_services_password_screen_and_enter_password()
     navigate_to_set_date_and_time()
     verify_entered_date_and_time(hour="24", min="33", day="1", month="3", year="2022", valid_parameter_passed=config.INVALID)
-    verify_entered_date_and_time(hour="00", min="60", day="1", month="3", year="2022", valid_parameter_passed=config.INVALID)
+    verify_entered_date_and_time(hour="00", min="60", day="29", month="2", year="2020", valid_parameter_passed=config.INVALID)
     verify_entered_date_and_time(hour="13", min="33", day="32", month="2", year="2022", valid_parameter_passed=config.INVALID)
     verify_entered_date_and_time(hour="13", min="33", day="4", month="13", year="2022", valid_parameter_passed=config.INVALID)
     verify_entered_date_and_time(hour="22", min="33", day="22", month="12", year="2101", valid_parameter_passed=config.INVALID)
-    verify_entered_date_and_time(hour="22", min="33", day="22", month="12", year="1969", valid_parameter_passed=config.INVALID)
+    verify_entered_date_and_time(hour="22", min="33", day="22", month="11", year="1969", valid_parameter_passed=config.INVALID)
     verify_entered_date_and_time(hour="23", min="12", day="7", month="8", year="1977", valid_parameter_passed=config.VALID)
     utility.get_current_log_details(message_text=DATE_AND_TIME_MESSAGE)
     utils.tstDone()