Improve batches spec performance