Whoops

Turns out we didn't need to override HTTPConnection at all. Sets the timeout at
a higher level and gets rid of a ton of code and complexity.

Updates the tests to not refer to the unused classes.