some more fixes in tests