Clean up test tasks
Merge pull request #292 from ddfreyne/cleanup-test-tasks

Clean up test tasks