Updated tests to API changes.