Added more specs to Validator