Simplifying round-trip tests