Add rerun capability to script/test