-- improved webtests, applied patch and made modifications

Fixed 1 test, improved some and applied patch & made some modifications in the webtest.