fix corresponding issues in shunit2-xunit