Also: * simplify test-related code * add workaround for minizip-related build breakage in new versions