cleanup, added test for FileDepositor, improved null handling in MultipleTemplatePackager