Revert "sonar integ test fixes"

This reverts commit 583bce66b4f2138e31f8ec4bf637a02e11a60cbe.