Webtest fixes - Related to Search Builder
Merge pull request #1654 from monishdeb/WebTestFixes

Webtest fixes - Related to Search Builder