Add unit tests for adapter classes
Add unit tests for DescriptorUtils