fixed a lot of tests
rescue watchers task