Update tests for CMS Make changes.