updated Watcherlist so it works and watcherlisttest