-- webtest fixes and some improvements based on the error on server