Content negotiation tests added + bug fixes