Fixes for tests.