Create a watcher for testing. Some other minor change.