Revert some inadvertant tests (deriving ObjectEqualityComparitor from EqualityComparitor rather
than AbstractEqualityComparitor) that snuck into the checkin.