Moved extractEventKinds and added newWatcher to WatcherUtils for testing purposes.