Refactor tests with better factories
Finish rough refactor of factories