Add support for unquoted replies
Restore test and fix regression
Minor fixes