webtest removal
Merge pull request #3159 from will-moore/webtest_removal

webtest removal