Update the api
Add tests for services