Updating FunctionalTests to use HttpClient abstractions