Some more fixes to tests.