Improve sonar test coverage