Use more expressive error messages
Add another test