Increased unit test coverage for Sonar