refactored webview tests
Merge pull request #2569 from sebv/master

Refactored webview tests