sonar integ test fixes