[Validator] Fixed failing tests