Merge pull request #2500 from TheBlueMatt/2023-08-fix-test-lifetimes