fix tests as a result of changes to support ImportBatch events