Redo tests TOC for better legibility.

Place tests alphabetically.
Put similar tests under a common heading.
Fix name of file in one test.