Fix: simplify comma-spacing logic (fixes #1562)

Three of the tests had the "after" error coming before the "before" error. The altered code always checks before the comma before it checks after the comma, so I swapped the expected error messages around, resulting in what to me seems like a more natural ordering.