Changing test framework to use factories instead of fixtures