Reduce the duplicates and add more coverage as it still respectively greater than 3.0% and below 80%

The last runs of sonar (issue 23) gives a coverage of 58.1% and a percentage of duplicates of 7.69%.