make sure to test a full round trip

Change-Id: I29c00bd6b08ff88680fa1c0b2d051d3519a9fc56