Deprecated API usage cleanup, part2

It seems we need a DMR comparison utility, although that doesn't solve the problem of having the thing to compare to. I don't like completely dropping this test and testChildDescriptionProvider() though. Perhaps just some more fine-grained assertions to validate that the description was created correctly, rather than just assertSame on the DescriptionProvider?