improved tests and watcher. should be ready soon