go to test 8 : Big refactor : code & test