Update the tests to fit the fix