Refactored and cleaned fixtures.