Improve diagnostics win Win/Web test