Webtest fixes

more fixes for failing webtest and pcp