Changes from Batch Test