[it] improve expected/output structure
[it] improve expected/output structure

reproto/reproto,reproto/reproto,reproto/reproto,reproto/reproto,reproto/reproto,reproto/reproto,reproto/reproto,reproto/reproto,reproto/reproto,reproto/reproto,reproto/reproto