SONAR-2501 add unit tests