EAGLESIX-812 fixed batch loop and test cases