Confine hierarchical searches for wired endpoints; update test cases

Deja Vu