Tests for label edit and minor ui changes
Tests for label edit and minor ui changes v2