Use test components instead of production SimpleReporter components
Merge branch 'fireteam' into gb_master