removed unecessary with-batch macro. Rewrote the test for batch operations