Add unit testing and validations in specific cases
Add descriptor tests. Enhance descriptor for more accurate descriptions.