Merge pull request #23826 from marination/rfq-test-fixes

chore: Reposition RFQ fields