Fix to prevent testSearch() from flapping
Fixing ForcePluginsTest to run on Jenkins
Merge pull request #504 from bhariharan/unstable

Fix to prevent testSearch() from flapping