SONAR-2501 Complete unit test