Improve validate settings and correct tests