-- applied patch and made some modifications

applied patch and made some modifications in the webtest.