Cleanup
Added content negotiation tests