Added: tests, #WITH(String), #comma, and fixes.