Test organization

The current set of tests is unorganized.  It's easy to add new tests, but hard to see (without reading every test) what's been tested, whether there's duplicate tests, etc.

Would it make sense to break up the tests into separate files?

Also, 'comment-only' tests got removed.  I think we should re-add them to aid documentation.
