Sonar corrections. Unit tests and code coverage added

No match.