Improved the Zip class and added Unit Tests for it