Fix Batching tests.

b/17179564

Change-Id: I30a00cf606fda8b577583917ebede454d6ec75da
6 files changed