Update more tests to the new API.