Some test & benchmark improvments.
Formatting.