Merge "Ziparchive: Give tests a test config"