ContentType now passes all pre-existing tests