US546 - Retry working...more test coverage