refactor(httpclient): cleaned up usage in tests