Update the tests using the new returned values