Refactoring tests and factories
Prepping for job import