XD-99 - Fix Code Coverage not shown in Sonar