Cleaned up round trip tests