Adding tests for Descriptor/ClassDescriptor, also fixing a few coding standard errors