Add webtest to deps
Refactor tasks
Fix testing.