Add batch save test