API changes and tests