Fix tests, pattern matches. Contract is *ignored* in equality testing. svn: r12227 original commit: 477fa5581e1c9923df030e0eea86a62c367f014f
original commit: 5ac64589baffabf3e7045e5c0c877a1c484207ea