Merge branch 'fc/test-aggregation-clean-up'

Code clean-up for test framework. * fc/test-aggregation-clean-up: test: don't print aggregate-results command test: simplify counts aggregation