Merge pull request #7 from guywithnose/master

Minor fixes
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.
Updated test match changes to UI.
Merge pull request #9 from chrisryan/master

Updated test match changes to UI.
Skip randomly failing test