Feature/vov 2757

Refactor and tests for batch ingest.