fixed export and file tests pertaining to #20946 changes
cleanup
Merge pull request #917 from tjwebb/INCDT-Feature-20946

Fixed datasource tests for Issue #20946