Update tests for ApiService changes