Small fixes to tests.