Cleaned up `FactoryTest` a bit.