add quoting and tests