Batch Test improvements

No match.