Reformat to new style
Put back missing whitespace in XML test files