Add in "batch_id" (which is the renderer name)...

- Fix the tests
- Slight refactoring as well