Update the tests to reflect the new ABI.