Fix all but 3 tests.