Start fixing tests.