Cleaning up broken tests and zip_with interface change