Fix failing zip test cases