derneires modifications + ajout tests