Polish "Cleanup error handler tests"

Continues the refactoring by the previous commit by splitting
out the batch vs. record helper methods to avoid large method
with if/else.

Signed-off-by: onobc <[email protected]>

Author: onobc