fix tests
fixed watcher