Merge "add sonar test inclusions"