Mini refactoring of the fixture loading