Merge pull request #6995 from morozov/rework-introspection-reflection-tests

Rework schema introspection tests that use reflection

Author: morozov