Fix failing tests caused by the test API changes.