Added : more readable test + refactoring