Add Validator tests
Add some more code