tree: setup TestTreeStopRecursive; fix an edge-case for Watch