two more fixes in tests