Confine hierarchical searches for wired endpoints; update test cases (closes #22)