Upgrading system tests to use newer HttpClient API