Added content-type tests and code