Make the tests compilable after the latest API changes.