Backport r87672 and r87615, improving tests, using super() instead of direct parent references, and using  __reduce__ method for pickling.