Change how test labels are combined, per code review comments.