Last API changes in unit test