Merge "Fix sonar issues for tests in policy-models"