Merge pull request #8 from nubs/master

Update tests for CMS Make changes.