Fix reporting of retried tests
6 files changed