Fixture refactoring