All cases working and re-run