Merge pull request #51 from arik-so/2023/08/pre_test_refactors