Fixes in tests