Hardening/more cpp xmls to separate files

### Description
Almost all the test files are now stripped from XML/JSON data.
This PR contains a few additional fixes.
Unfortunately, it includes an XSD error, but that will hopefully be taken care of while the PR is 'in the air'