Fixes to unzip, tests now pass.