Start quoting user supplied values and update tests
Fix line-ending bug