Add test for ZipValidator, and other minor refactoring.
Merge origin/master