Improved stability when several tests are batched.
Merge commit 'a1409399af21d475790cc655a74d3c5526d6273c'