Fix fixer and add a test.