Add zip module, update tests accordingly