Add test for full roundtrip