Further refactoring to move test data generation closer to each test