fix task & tests