Merge pull request #1429 from kurund/webtest-fixes