API changes. Test updates