Test for Descriptor.diff()
Descriptor subclasses no longer test diff()
Descriptor tests less likely to break when wording changes
INTEGRATE: Descriptor test cleanup

* dev:
  Descriptor tests less likely to break when wording changes
  Descriptor subclasses no longer test diff()
  Test for Descriptor.diff()