Add simple watcher
Add manual router test