Update tests for CMS Make changes.
Fix search query
Merge pull request #1 from guywithnose/forNubs

Fix search query
Merge pull request #8 from nubs/master

Update tests for CMS Make changes.