Modularize task tests

This probably isn't the best way to structure the tests, it's just
a first step on the road to a better splitting of this.
Merge pull request #11 from andyw8/modularize-task-tests

Modularize task tests