Update tests client to use ids instead of uris