Change how test labels are combined, per code review comments.
Merge remote-tracking branch 'benjy/analysis_test2' into 0.13