Fixing more xunit format issues