Finish updating tests to match new API.