Add test cases (and fix bugs) for retrying to alternate destinations