Add expected messages to the death tests.
Conditional error messag.
Lint
Merge pull request #130 from pleroy/DeathTests

Add expected messages to the death tests.