Add tests for WatchList (and refix)