SONAR-5209 Tests feedback applied