Big refacto of validator test using data provider