improve Tournee test, refactor utils