Realizing that the problem is in unzip
Moved to testing unzip test only
Removed dead TODO