REVIEW-2446: remove duplicate zip related tests; minor cleanup