Fix test compilation again.
Fix more tests.