added watch task and some more tests