Fixing more xunit format issues
build-33