For now keep below webtest 2 due to backward incompatible changes