Improve grouping within main() of benchmark tool
Improve grouping within main() of benchmark tool

Make the grouping of test variants a little more consistent.

Signed-off-by: Wincent Colaiuta <c76ac2e9cd86441713c7dfae92c451f3e6d17fdc@wincent.com>

wincent/WOPublic,wincent/WOPublic