Undid my cleaning up of factories and tests and went with what just works