SONARJAVA-228 Fix the false positives and negatives