Improve test coverage
Fix equality bug for methods (name wasn't being taken into account)
Simplify compares