Add test for watcher, fix bug where watch key was not being reset.