Fix labeling visibility and tests