Adjust tests to match new signature.