Update content-type test.
Merge branch 'complete-content-type' into online-touch