SONAR-4397 Fix tests