Backfill tests for Recover and refactor for clarity

[#83656106]