Finished refactor to fixtureUtils