For ENG-4786, fix tests broken by changes to @SnapshotRestore arguments