Fix 3 webtests, and cleanup