allow DescriptorEngine to load the two descriptors that require an IChemObjectBuilder injection. DescriptorTest was updated and generiffied to allow testing of the modified descriptors.