Refacto + test auto
refacto et merge
merging again?