Merge "Fix test coverage not being reported in Sonar"