Improved batch test