Added expected exception messages in unit tests