[506817] Change test files to nested mappings/queries
16 files changed