Removed useless condition
Improved the Zip class and added extra test