Fixing tests that use the search box
Merge pull request #660 from AndreiH/fix_search_tests

Fixing tests that use the search box
Merge pull request #663 from mozilla/master

Merge master into prod