Merge "Fix sonar not reporting unit tests"