Added more tests for tasks