--Webtest fixes
Merge pull request #719 from NileemaJadhav/HR-14-fixes

--Webtest fixes