More fixes to tests.