Add support for re-test flag