Add factory tests; rework zip
Merge pull request #12 from nickb1080/factory-test

Add factory tests; rework zip (closes #11)