tests for ZipUtil + ZipUtil.unzip can unwrap single top level folder
Minor code optimization