Fixer code fixes and more tests