Merge "Add test tag as part of the code coverage output file path"