Finalizing unzip test case and cleaning
Resolving conflict