Fix double quoting inside single quoted strings, character class not handling escaped chars also some tests