(#61) - fix concurrent batch del while iterating

The test fails before the fix, but succeeds after.
Also added some other tests just as a nice-to-have.