Standardize on plural tests
Smashed together words are hard to read
httplib adapter test
Python 3 compatibility
Deal with str/bytes mismatch in python 3
Python 3 compatibility (ugh)