Fixed #1 and added unit tests for WatcherService