Minor changes for fixtures and tests