Improved tests for batch extension

Fix false positive in manual index tests .  Add checking of return values for manual and key index tests.