Specific classes that should be refactored include HookTestArchival and Archival. As part of this ticket, end-to-end test the archival process to ensure that it works on all OSes and that it doesn't affect test outcomes meaningfully.