improve batch tests