Merge "tests: Fix unit/zip_test.cpp."