Merge pull request #2074 from TheBlueMatt/2023-03-fix-threaded-test