Fix Sonar + coverage