Add hierarchical query resolver tests