Add more tests using batch API