Re added PropertyDescriptor collection. Looks like the method got dropped during one of the rebase operations. Additionally make use of .distinct() name collection in tests as descriptors might appear multiple times for the same property name.