more tests + watcher + implemented some servlets