Tweaked test labeling logic.