Added batch saving and deleting with test