Fixed naming issue with Zip/zip
Commented tests