Fixes in tests again