Improve watch task, run test run watched changes