Descriptor resolve create bug and test fixes.