Fixed a failing unit test and potential zip import bug because of changes in DotNetZip version 1.9.2-rc1 (closes #257)
Refactored duplicated code