Tidy up path generation in dynamic translation tests
Merge remote-tracking branch 'akbar/safe_refactor' into safe_refactor