Merge "zip_archive: Fix a few more badly written tests."