Added some round trip tests.