Updated TODOs cleanup for round trip testing.