rename restartWatcher to configWatcher
fix tests