Webtests fixes for CRM-15701 fix