Fix & test returned content types