fixes in tests