Unit tests reflect changes to escape character representation.
Fixed issues with double quotes in generators.
Merge branch 'master' into gh-pages
Fixed issues with double quotes.