Minor updates.

- Restructure tests.
- Consolidate view formatting.