Updated: Batch class test