Changes for implementing BatchImportHandlerTest