Fix tests for tasks