Added a lot more code coverage for validators.