Improve avoid validation test: #900