updated implementation for the webtest