Fix the tests to match accordingly