Fix test with latest API changes