Remove contrib as it is not used anywhere
PEP8, use latest httpretty style, add test for another file which was known to cause errors in type guessing
Split tests into multiple files