More fixes for tests.