Attempting to demonstrate and resolve #711

There is also some test cleanup in RetryTests (in addition to some format cleanup...sorry about that noise..happy to get rid of that)