more fixes for tests