Various fileset query tests. See #10782
Merge pull request #1217 from will-moore/split_fileset_query_tests_10782

Various fileset query tests. See #10782