Add tests for Validator