Fix most of the tests.