Use internal hold functionality of sets
Update tests up to changed batch handling