Split the Accept/Content-Type tests into two, with two status codes