Fix for #1555

Some parameters are passed into the batch file already quoted. Test specifically for this.