Improve JUnit support

These are small improvements to merged JUnit support for Merge Requests:

Edited by Shinya Maeda