Improve code coverage in sonar