Refactored ZipJobTest test data creation