Updated equality tests
Use equal and not_equal in generic.