Merge branch 'rj/t1050-use-test-path-is-file'