Merge branch 'cp/t9146-use-test-path-helpers' into HEAD