small refactor of FixtureCreator