fix: tests (interred)
chg: simplify rFindHdl