Merge "Batch Test improvements"