*some fixes for tests.