Merge "Run ZipFile.testzip() during zipfile tests."