fix watcher test and keyword test