Fixing the tests after PR #1