Test Valide + Refactor