SONAR-5209 Apply feedback on coverage