better tests, lower level HTTP client stubbing