Fix test failures due to quotes(") too many trimmed