fixed test-datasource
Merge pull request #1133 from tjwebb/22049-test-reorg

Issue #22049: fixed "test-datasource" tests