-- webtest fix

Fixed one test and improved another based on the server timeout.