Updating FunctionalTests to use HttpClient abstractions

I'm not super sure if there was any benefit in doing this that I'm missing - let me know if this needs to be reverted.