web-tests refactored