Fixes in tests.