Fix more tests.