Remove exception messages and add equality test