Add Watch Task
Updates unit tests.