rename guzzle clients, clean up HttpClientTest and fix classname/filename mismatch