Updating FunctionalTests to use HttpClient abstractions

I believe it's fine