_add_batch spillover instance fixes, fixed tests