branchzio/fix/watcher-test-wait-handlescancel