Merge pull request #4064 from ugbotueferhire/fix/shell-substitution-tests