Reorganizing TaskBatch and Task constructors
Fixing up tests for normal requirement plugs