sonar integ test fixes (this time wo/ unrelated changes to other code)