Refactor tests and make sure they work with httpretty 0.6. Still one failing.