Added roundtrip tests for Yaoqiang 2.2.3