Adding the task_queue and test cases (TODO)