Update the tests to reflect the latest changes