Bump Typhoeus version
Move tests around
Refactor the :poop: out of everything