Unittest clean-up

- Sort modules and tests alphabetically (they were maddeningly close to alphabetic)
- Consistently label unit test groups at top-level