Fixed a few content-type related tests.