Merge pull request #3398 from henricm/fix-for-test-helpers-symlink