Fix fixtures and tests.