Use a 0-time retry function for tests
Improve documentation for Watcher