add test for watcher, upgrade accord version