Refactor to use FactoryBoy