Remove dependencies on httpcomponents in test.