Added unittests for tasks
Added integration tests