Add support for re-test flag

Add support for re-test flag