Yet another reorg of scenarios/
Fixes issue where last item of Enumerable was nil

Also adds scenario tests for batches