Made changes asked in review by claudep

- Simplify Test
- Compare empty label with None to allow empty label string
- Return to a backwards compatible state