Changed some configuration and removed broken unit test since those are
not working in HttpClient 4.3 due to deprecated classes/methods and
library architecture change.