Merge "Fix test for cross-protocol transfer"