split TestWatchService in Watcher and TestWatcherService. integrate with logger
converted Watcher in singleton class