Add Validator collection and tests