Fix sonar issue and add code coverage