remove unnecessary backslashes in tests
update form builder to only use return val if it's a string

This closes #2192 by updating the fix for #887 to simply drop any
return value that isn't a string.