Updating tests to be more specific now that data-file-name is available

Updating tests to be more specific now that data-file-name is available #6688