Fixes for implementing BatchImportHandlerTest