Some fixes to tests.