Don't yaml-ify args with newlines
Merge pull request #4047 from basepi/testfixes

Don't yaml-ify args with newlines