Correct fixture and fix tests.