Batch Test improvements

Issue-ID: AAF-776
Change-Id: Ia12106331a1db608955abd353785ab2e765b3c41
Signed-off-by: Instrumental <jonathan.gathman@att.com>
26 files changed