Merge pull request #972 from rishy/Batch-API

fixed integration tests in BatchApiTest