- Fix batch submission
- Fix tests