Expanded the content-type example, added tests.