More updates to the client, api and test app