Modified extract of zip files when stripping leading folder to handle the case when it's not necessary to strip the folder.  Added test.