Modified TODO task with all test cases