added the watcher, watcher-test, test-helper