unfold message body tests
Merge branch 'R_2_0'
fix expectation
Merge branch 'R_2_0'