Continued refactor of tests and factories