Delete matchers (Same/NotSame) and change behavior of Equals/NotEquals