Add task helpers. Refactor specs.
Merge branch 'features/fix-specs'