added batch call tests and refactored feature