Add tests and support for content types