Merge "Refactor _find_caller into a public test finder utility"