more fixes in tests