Fixes in the structure, trying to use a suite, reworked the fixture loading