Fixing the tests to match