Add test cases & fix a typo that caused quotes to not be wrapped correctly.