Add task helpers. Refactor specs.