fixes for tests
more fixes