Replaced mock with BasicHeader object
That was dumb.

Revert "Added type to generic declarations to play nicely with Scala/mocking"

This reverts commit c7e5097e5869185061b1d5625b68e76e6617eab4.
Removed the generic variable in ServiceClientResponse and references to it, a few lines of cleanup