Added more tests, first pass on full functionality of Batch API