Partial addition of allowing rerun on various and sundry test states. Partial fix of -set-run-state and -get-run-state