More tests for Equality

And a minor refactoring in the Equality use function.