fixes for tests.