Fix httpclient based test