deal with xcpng refactors

[DaanHoogland]

Description

This PR...

Fixes: #13292

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)
• Build/CI
• Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

• Major
• Minor

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 18.00%. Comparing base (2e63c60) to head (f2d5e10).

Additional details and impacted files

@@            Coverage Diff            @@
##               4.22   #14287   +/-   ##
=========================================
  Coverage     18.00%   18.00%           
- Complexity    16219    16221    +2     
=========================================
  Files          5936     5936           
  Lines        535716   535716           
  Branches      65596    65596           
=========================================
+ Hits          96459    96465    +6     
+ Misses       428268   428261    -7     
- Partials      10989    10990    +1     

Flag	Coverage Δ
uitests	4.02% <ø> (ø)
unittests	19.08% <ø> (+<0.01%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.