Some functionnal testing driving me to changes