Merge pull request #2625 from tnull/2023-09-moar-tests-n-fixes