Tests rearrangement, new test suite for fixtures