Have tests use cmssdt rather than cmsdoc.
Merge pull request #3813 from ktf/fix-utilities-tests

Misc cleanup -- Have tests use cmssdt rather than cmsdoc.