Rework factories for both Spring and non-Spring to clean up construction and injection for various integration test use cases.