Added Headerbatchlet tests
Minor refactoring for import batch