Added more tests for content and content types