Further enhancements to the API, with one unit test