refactored add watcher tests to reuse the options.