Add tests to improve code-coverage stats in Sonar