EG: refactored test and added batch test