Fixture refactored