Minor tweaks to v2 playbook iterator to support executor testing