Fix batch_test