This also changes the spec to actually call the batching strategy class
so that future regressions can be avoided.

Changelog: fixed