Cleaning up api's api and tests