Merge pull request #3938 from clumens/update-path
Refactor: cts: Condense $PATH code into a single function