WIP Fix the tests.