Add unit tests for Descriptors