More fixes in tests.