changed all the tests
and the watcher works like a charm