Fix some tests.
Fix more tests.
Fix tests.