Updates unit tests to use the newer new ContentType method and obsoletes the old one