Convert to XCTest.
Fix failing test by roundtripping twice.