Reorganize the test fixtures