WIP on fixing tests.