Fix a data label issue, add unit Test

Use NUnit unit tests