Fix the rest of batch_test