Minor fixes to batch test