[refactor] bundle stream to output a meaningful XML stream
[test] update tests to reflect new dispatch output