Follow proper quoting rules
Write and fix tests for new code