Completing the Validator tests and implementations