More test reorg.
A few cosmetic tweaks.