make it clearer which XML goes where in assertXmlEquals
fix test to not care about attribute ordering