Fixed failing tests due to change in key validations.

@YolinaS