SONAR-4680 Fix tests