Remove TestTaskId, add taskIdCollection to Test