Moving Watcher into separate service and providing a test for it.