Switch to rspec 3
Extract #extract_headers and #extract_body methods