fixes for tests

Main point of the fixes is to make sure imported MusicXML is exported
the exact same way, and not a slightly different but functionally
equivalent way, since the tests expect this.