Fix tests
Fix Zooowner connection
Split Watcher into StateWatcher and EventWatcher