Label cmp test mods

Cleaning up some conflicts between test names and implementation here.

@rev mkohanfars@
@bug W-1935342@
Merging origin/tbliss/master-pending-label-test-mods into master