Fix quoting in more tests