SONAR-2501 Fix tests