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

Change-Id: Iaaa56006cc57acf8950040fa99cacae828c5858e