ISSUE-85 - Update test framework (left web-tests suspended)