Work on fixing tests.